home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1994-08-10 | 86.5 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 72 6f 6c 61 6e 64 40 |piled by| roland@|
|00000020| 63 68 75 72 63 68 79 2e | 67 6e 75 2e 61 69 2e 6d |churchy.|gnu.ai.m|
|00000030| 69 74 2e 65 64 75 20 6f | 6e 20 57 65 64 20 41 75 |it.edu o|n Wed Au|
|00000040| 67 20 31 30 20 31 39 3a | 31 31 3a 34 32 20 31 39 |g 10 19:|11:42 19|
|00000050| 39 34 0a 3b 3b 3b 20 66 | 72 6f 6d 20 66 69 6c 65 |94.;;; f|rom file|
|00000060| 20 2f 67 64 2f 67 6e 75 | 2f 65 6d 61 63 73 2f 31 | /gd/gnu|/emacs/1|
|00000070| 39 2e 30 2f 6c 69 73 70 | 2f 65 64 69 66 66 2e 65 |9.0/lisp|/ediff.e|
|00000080| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|00000090| 69 6f 6e 20 31 39 2e 32 | 35 2e 39 32 2e 33 2e 0a |ion 19.2|5.92.3..|
|000000a0| 3b 3b 3b 20 62 79 74 65 | 63 6f 6d 70 20 76 65 72 |;;; byte|comp ver|
|000000b0| 73 69 6f 6e 20 46 53 46 | 20 32 2e 31 30 0a 3b 3b |sion FSF| 2.10.;;|
|000000c0| 3b 20 6f 70 74 69 6d 69 | 7a 61 74 69 6f 6e 20 69 |; optimi|zation i|
|000000d0| 73 20 6f 6e 2e 0a 3b 3b | 3b 20 74 68 69 73 20 66 |s on..;;|; this f|
|000000e0| 69 6c 65 20 75 73 65 73 | 20 6f 70 63 6f 64 65 73 |ile uses| opcodes|
|000000f0| 20 77 68 69 63 68 20 64 | 6f 20 6e 6f 74 20 65 78 | which d|o not ex|
|00000100| 69 73 74 20 69 6e 20 45 | 6d 61 63 73 20 31 38 2e |ist in E|macs 18.|
|00000110| 0a 0a 28 69 66 20 28 61 | 6e 64 20 28 62 6f 75 6e |..(if (a|nd (boun|
|00000120| 64 70 20 27 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |dp 'emac|s-versio|
|00000130| 6e 29 0a 09 20 28 6f 72 | 20 28 61 6e 64 20 28 62 |n).. (or| (and (b|
|00000140| 6f 75 6e 64 70 20 27 65 | 70 6f 63 68 3a 3a 76 65 |oundp 'e|poch::ve|
|00000150| 72 73 69 6f 6e 29 20 65 | 70 6f 63 68 3a 3a 76 65 |rsion) e|poch::ve|
|00000160| 72 73 69 6f 6e 29 0a 09 | 20 20 20 20 20 28 73 74 |rsion)..| (st|
|00000170| 72 69 6e 67 2d 6c 65 73 | 73 70 20 65 6d 61 63 73 |ring-les|sp emacs|
|00000180| 2d 76 65 72 73 69 6f 6e | 20 22 31 39 22 29 29 29 |-version| "19")))|
|00000190| 0a 20 20 20 20 28 65 72 | 72 6f 72 20 22 60 2f 67 |. (er|ror "`/g|
|000001a0| 64 2f 67 6e 75 2f 65 6d | 61 63 73 2f 31 39 2e 30 |d/gnu/em|acs/19.0|
|000001b0| 2f 6c 69 73 70 2f 65 64 | 69 66 66 2e 65 6c 27 20 |/lisp/ed|iff.el' |
|000001c0| 77 61 73 20 63 6f 6d 70 | 69 6c 65 64 20 66 6f 72 |was comp|iled for|
|000001d0| 20 45 6d 61 63 73 20 31 | 39 22 29 29 0a 0a 28 62 | Emacs 1|9"))..(b|
|000001e0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c3 |yte-code| "..!...|
|000001f0| c4 5c 22 88 c2 c5 c6 5c | 22 88 c2 c7 c8 5c 22 88 |.\"....\|"....\".|
|00000200| c2 c9 ca 5c 22 88 c2 cb | cc 5c 22 88 c2 cd ce 5c |...\"...|.\"....\|
|00000210| 22 88 c2 cf d0 5c 22 88 | c2 d1 d2 5c 22 88 c2 d3 |"....\".|...\"...|
|00000220| d4 5c 22 88 c2 d5 d6 5c | 22 88 c2 d7 d8 5c 22 88 |.\"....\|"....\".|
|00000230| c2 d9 da 5c 22 88 c2 db | dc 5c 22 87 22 20 5b 72 |...\"...|.\"." [r|
|00000240| 65 71 75 69 72 65 20 65 | 6d 65 72 67 65 20 64 65 |equire e|merge de|
|00000250| 66 61 6c 69 61 73 20 65 | 64 69 66 66 2d 69 66 2d |falias e|diff-if-|
|00000260| 6c 75 63 69 64 20 28 6d | 61 63 72 6f 20 2e 20 23 |lucid (m|acro . #|
|00000270| 5b 6e 69 6c 20 22 c0 87 | 22 20 5b 28 73 74 72 69 |[nil "..|" [(stri|
|00000280| 6e 67 2d 6d 61 74 63 68 | 20 22 4c 75 63 69 64 22 |ng-match| "Lucid"|
|00000290| 20 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 29 5d | emacs-v|ersion)]|
|000002a0| 20 31 5d 29 20 65 64 69 | 66 66 2d 6f 64 64 2d 70 | 1]) edi|ff-odd-p|
|000002b0| 20 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 61 72 67 | (macro |. #[(arg|
|000002c0| 29 20 22 c0 c1 5c 6e c3 | 42 42 c4 42 42 87 22 20 |) "..\n.|BB.BB." |
|000002d0| 5b 65 71 20 6c 6f 67 61 | 6e 64 20 61 72 67 20 28 |[eq loga|nd arg (|
|000002e0| 31 29 20 28 31 29 5d 20 | 34 5d 29 20 65 64 69 66 |1) (1)] |4]) edif|
|000002f0| 66 2d 62 75 66 66 65 72 | 2d 6c 69 76 65 2d 70 20 |f-buffer|-live-p |
|00000300| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 62 75 66 29 |(macro .| #[(buf)|
|00000310| 20 22 c0 09 c2 09 44 c3 | c2 09 44 44 46 87 22 20 | "....D.|..DDF." |
|00000320| 5b 61 6e 64 20 62 75 66 | 20 67 65 74 2d 62 75 66 |[and buf| get-buf|
|00000330| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 5d |fer buff|er-name]|
|00000340| 20 36 5d 29 20 65 64 69 | 66 66 2d 67 65 74 2d 62 | 6]) edi|ff-get-b|
|00000350| 75 66 66 65 72 20 28 6d | 61 63 72 6f 20 2e 20 23 |uffer (m|acro . #|
|00000360| 5b 28 61 72 67 29 20 22 | c0 c1 5c 6e c3 42 42 c4 |[(arg) "|..\n.BB.|
|00000370| 42 c1 5c 6e c5 42 42 c6 | 42 45 87 22 20 5b 63 6f |B.\n.BB.|BE." [co|
|00000380| 6e 64 20 65 71 20 61 72 | 67 20 28 28 71 75 6f 74 |nd eq ar|g ((quot|
|00000390| 65 20 41 29 29 20 28 65 | 64 69 66 66 2d 41 2d 62 |e A)) (e|diff-A-b|
|000003a0| 75 66 66 65 72 29 20 28 | 28 71 75 6f 74 65 20 42 |uffer) (|(quote B|
|000003b0| 29 29 20 28 65 64 69 66 | 66 2d 42 2d 62 75 66 66 |)) (edif|f-B-buff|
|000003c0| 65 72 29 5d 20 35 5d 29 | 20 65 64 69 66 66 2d 63 |er)] 5])| ediff-c|
|000003d0| 68 61 72 2d 74 6f 2d 62 | 75 66 74 79 70 65 20 28 |har-to-b|uftype (|
|000003e0| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 61 72 67 29 20 |macro . |#[(arg) |
|000003f0| 22 c0 c1 5c 6e c3 42 42 | c4 42 c1 5c 6e c5 42 42 |"..\n.BB|.B.\n.BB|
|00000400| c6 42 45 87 22 20 5b 63 | 6f 6e 64 20 65 71 20 61 |.BE." [c|ond eq a|
|00000410| 72 67 20 28 39 37 29 20 | 28 28 71 75 6f 74 65 20 |rg (97) |((quote |
|00000420| 41 29 29 20 28 39 38 29 | 20 28 28 71 75 6f 74 65 |A)) (98)| ((quote|
|00000430| 20 42 29 29 5d 20 35 5d | 29 20 65 64 69 66 66 2d | B))] 5]|) ediff-|
|00000440| 67 65 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 28 |get-diff|erence (|
|00000450| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 6e 29 20 22 c0 |macro . |#[(n) ".|
|00000460| c1 5c 6e 45 87 22 20 5b | 61 72 65 66 20 65 64 69 |.\nE." [|aref edi|
|00000470| 66 66 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 76 65 |ff-diffe|rence-ve|
|00000480| 63 74 6f 72 20 6e 5d 20 | 33 5d 29 20 65 64 69 66 |ctor n] |3]) edif|
|00000490| 66 2d 6e 6f 2d 66 69 6e | 65 2d 64 69 66 66 73 20 |f-no-fin|e-diffs |
|000004a0| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 6e 29 20 22 |(macro .| #[(n) "|
|000004b0| c0 87 22 20 5b 28 61 72 | 65 66 20 28 65 64 69 66 |.." [(ar|ef (edif|
|000004c0| 66 2d 67 65 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |f-get-di|fference|
|000004d0| 20 6e 29 20 33 29 5d 20 | 31 5d 29 20 65 64 69 66 | n) 3)] |1]) edif|
|000004e0| 66 2d 67 65 74 2d 64 69 | 66 66 2d 6f 76 65 72 6c |f-get-di|ff-overl|
|000004f0| 61 79 2d 66 72 6f 6d 2d | 76 65 63 74 6f 72 20 28 |ay-from-|vector (|
|00000500| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 76 65 63 20 62 |macro . |#[(vec b|
|00000510| 75 66 2d 74 79 70 65 29 | 20 22 c0 09 c2 c3 5c 66 |uf-type)| "....\f|
|00000520| c5 42 42 c6 42 c3 5c 66 | c7 42 42 c8 42 45 45 87 |.BB.B.\f|.BB.BEE.|
|00000530| 22 20 5b 61 72 65 66 20 | 76 65 63 20 63 6f 6e 64 |" [aref |vec cond|
|00000540| 20 65 71 20 62 75 66 2d | 74 79 70 65 20 28 28 71 | eq buf-|type ((q|
|00000550| 75 6f 74 65 20 41 29 29 | 20 28 30 29 20 28 28 71 |uote A))| (0) ((q|
|00000560| 75 6f 74 65 20 42 29 29 | 20 28 31 29 5d 20 37 5d |uote B))| (1)] 7]|
|00000570| 29 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |) ediff-|get-diff|
|00000580| 2d 6f 76 65 72 6c 61 79 | 20 28 6d 61 63 72 6f 20 |-overlay| (macro |
|00000590| 2e 20 23 5b 28 6e 20 62 | 75 66 2d 74 79 70 65 29 |. #[(n b|uf-type)|
|000005a0| 20 22 c0 c1 5c 6e 44 0b | 45 87 22 20 5b 65 64 69 | "..\nD.|E." [edi|
|000005b0| 66 66 2d 67 65 74 2d 64 | 69 66 66 2d 6f 76 65 72 |ff-get-d|iff-over|
|000005c0| 6c 61 79 2d 66 72 6f 6d | 2d 76 65 63 74 6f 72 20 |lay-from|-vector |
|000005d0| 65 64 69 66 66 2d 67 65 | 74 2d 64 69 66 66 65 72 |ediff-ge|t-differ|
|000005e0| 65 6e 63 65 20 6e 20 62 | 75 66 2d 74 79 70 65 5d |ence n b|uf-type]|
|000005f0| 20 33 5d 29 20 65 64 69 | 66 66 2d 67 65 74 2d 66 | 3]) edi|ff-get-f|
|00000600| 69 6e 65 2d 64 69 66 66 | 2d 76 65 63 74 6f 72 2d |ine-diff|-vector-|
|00000610| 66 72 6f 6d 2d 76 65 63 | 20 28 6d 61 63 72 6f 20 |from-vec| (macro |
|00000620| 2e 20 23 5b 28 63 75 72 | 72 65 6e 74 2d 64 69 66 |. #[(cur|rent-dif|
|00000630| 66 2d 76 65 63 29 20 22 | c0 09 c2 42 42 87 22 20 |f-vec) "|...BB." |
|00000640| 5b 61 72 65 66 20 63 75 | 72 72 65 6e 74 2d 64 69 |[aref cu|rrent-di|
|00000650| 66 66 2d 76 65 63 20 28 | 32 29 5d 20 33 5d 29 20 |ff-vec (|2)] 3]) |
|00000660| 65 64 69 66 66 2d 73 65 | 74 2d 66 69 6e 65 2d 64 |ediff-se|t-fine-d|
|00000670| 69 66 66 2d 76 65 63 74 | 6f 72 20 28 6d 61 63 72 |iff-vect|or (macr|
|00000680| 6f 20 2e 20 23 5b 28 6e | 20 66 69 6e 65 2d 76 65 |o . #[(n| fine-ve|
|00000690| 63 29 20 22 c0 c1 5c 6e | 44 c3 5c 66 46 87 22 20 |c) "..\n|D.\fF." |
|000006a0| 5b 61 73 65 74 20 65 64 | 69 66 66 2d 67 65 74 2d |[aset ed|iff-get-|
|000006b0| 64 69 66 66 65 72 65 6e | 63 65 20 6e 20 32 20 66 |differen|ce n 2 f|
|000006c0| 69 6e 65 2d 76 65 63 5d | 20 34 5d 29 20 65 64 69 |ine-vec]| 4]) edi|
|000006d0| 66 66 2d 6d 61 72 6b 2d | 64 69 66 66 2d 61 73 2d |ff-mark-|diff-as-|
|000006e0| 73 70 61 63 65 2d 6f 6e | 6c 79 20 28 6d 61 63 72 |space-on|ly (macr|
|000006f0| 6f 20 2e 20 23 5b 28 6e | 20 66 6c 61 67 29 20 22 |o . #[(n| flag) "|
|00000700| c0 c1 5c 6e 44 c3 5c 66 | 46 87 22 20 5b 61 73 65 |..\nD.\f|F." [ase|
|00000710| 74 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |t ediff-|get-diff|
|00000720| 65 72 65 6e 63 65 20 6e | 20 33 20 66 6c 61 67 5d |erence n| 3 flag]|
|00000730| 20 34 5d 29 20 65 64 69 | 66 66 2d 67 65 74 2d 66 | 4]) edi|ff-get-f|
|00000740| 69 6e 65 2d 64 69 66 66 | 2d 76 65 63 74 6f 72 20 |ine-diff|-vector |
|00000750| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 6e 29 20 22 |(macro .| #[(n) "|
|00000760| c0 c1 5c 6e 44 44 87 22 | 20 5b 65 64 69 66 66 2d |..\nDD."| [ediff-|
|00000770| 67 65 74 2d 66 69 6e 65 | 2d 64 69 66 66 2d 76 65 |get-fine|-diff-ve|
|00000780| 63 74 6f 72 2d 66 72 6f | 6d 2d 76 65 63 20 65 64 |ctor-fro|m-vec ed|
|00000790| 69 66 66 2d 67 65 74 2d | 64 69 66 66 65 72 65 6e |iff-get-|differen|
|000007a0| 63 65 20 6e 5d 20 33 5d | 29 5d 20 33 29 0a 28 64 |ce n] 3]|)] 3).(d|
|000007b0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 64 |efalias |'ediff-d|
|000007c0| 65 66 76 61 72 2d 6c 6f | 63 61 6c 20 27 28 6d 61 |efvar-lo|cal '(ma|
|000007d0| 63 72 6f 20 2e 20 23 5b | 28 76 61 72 20 76 61 6c |cro . #[|(var val|
|000007e0| 75 65 20 64 6f 63 29 20 | 22 c0 c1 5c 6e 0b 5c 66 |ue doc) |"..\n.\f|
|000007f0| 46 c5 c6 5c 6e 44 44 c7 | c6 5c 6e 44 c8 42 42 46 |F..\nDD.|.\nD.BBF|
|00000800| 87 22 20 5b 70 72 6f 67 | 6e 20 64 65 66 76 61 72 |." [prog|n defvar|
|00000810| 20 76 61 72 20 76 61 6c | 75 65 20 64 6f 63 20 6d | var val|ue doc m|
|00000820| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000830| 66 65 72 2d 6c 6f 63 61 | 6c 20 71 75 6f 74 65 20 |fer-loca|l quote |
|00000840| 70 75 74 20 28 28 69 66 | 20 28 65 64 69 66 66 2d |put ((if| (ediff-|
|00000850| 69 66 2d 6c 75 63 69 64 | 29 20 28 71 75 6f 74 65 |if-lucid|) (quote|
|00000860| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00000870| 29 20 28 71 75 6f 74 65 | 20 70 72 65 73 65 72 76 |) (quote| preserv|
|00000880| 65 64 29 29 20 74 29 5d | 20 36 20 22 5c 0a 44 65 |ed)) t)]| 6 "\.De|
|00000890| 66 69 6e 65 73 20 53 59 | 4d 42 4f 4c 20 61 73 20 |fines SY|MBOL as |
|000008a0| 61 6e 20 61 64 76 65 72 | 74 69 73 65 64 20 6c 6f |an adver|tised lo|
|000008b0| 63 61 6c 20 76 61 72 69 | 61 62 6c 65 2e 20 20 0a |cal vari|able. .|
|000008c0| 50 65 72 66 6f 72 6d 73 | 20 61 20 64 65 66 76 61 |Performs| a defva|
|000008d0| 72 2c 20 74 68 65 6e 20 | 65 78 65 63 75 74 65 73 |r, then |executes|
|000008e0| 20 60 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | `make-v|ariable-|
|000008f0| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 27 20 6f 6e |buffer-l|ocal' on|
|00000900| 0a 74 68 65 20 76 61 72 | 69 61 62 6c 65 2e 20 20 |.the var|iable. |
|00000910| 41 6c 73 6f 20 73 65 74 | 73 20 74 68 65 20 60 70 |Also set|s the `p|
|00000920| 72 65 73 65 72 76 65 64 | 27 20 28 45 6d 61 63 73 |reserved|' (Emacs|
|00000930| 29 20 6f 72 20 60 70 65 | 72 6d 61 6e 65 6e 74 2d |) or `pe|rmanent-|
|00000940| 6c 6f 63 61 6c 27 20 28 | 4c 75 63 69 64 29 0a 70 |local' (|Lucid).p|
|00000950| 72 6f 70 65 72 74 79 2c | 20 73 6f 20 74 68 61 74 |roperty,| so that|
|00000960| 20 60 6b 69 6c 6c 2d 61 | 6c 6c 2d 6c 6f 63 61 6c | `kill-a|ll-local|
|00000970| 2d 76 61 72 69 61 62 6c | 65 73 27 20 28 63 61 6c |-variabl|es' (cal|
|00000980| 6c 65 64 20 62 79 20 6d | 61 6a 6f 72 2d 6d 6f 64 |led by m|ajor-mod|
|00000990| 65 20 73 65 74 74 69 6e | 67 0a 63 6f 6d 6d 61 6e |e settin|g.comman|
|000009a0| 64 73 29 20 77 6f 6e 27 | 74 20 64 65 73 74 72 6f |ds) won'|t destro|
|000009b0| 79 20 45 64 69 66 66 20 | 63 6f 6e 74 72 6f 6c 20 |y Ediff |control |
|000009c0| 76 61 72 69 61 62 6c 65 | 73 2e 0a 0a 54 68 69 73 |variable|s...This|
|000009d0| 20 69 73 20 61 20 6d 65 | 72 67 65 20 6f 66 20 60 | is a me|rge of `|
|000009e0| 65 6d 65 72 67 65 2d 64 | 65 66 76 61 72 2d 6c 6f |emerge-d|efvar-lo|
|000009f0| 63 61 6c 27 20 66 6f 72 | 20 45 6d 61 63 73 20 61 |cal' for| Emacs a|
|00000a00| 6e 64 20 4c 75 63 69 64 | 20 45 6d 61 63 73 2e 20 |nd Lucid| Emacs. |
|00000a10| 20 49 74 20 69 73 0a 6e | 65 65 64 65 64 20 74 6f | It is.n|eeded to|
|00000a20| 20 6d 61 6b 65 20 74 68 | 65 20 73 61 6d 65 20 65 | make th|e same e|
|00000a30| 64 69 66 66 2e 65 6c 63 | 20 77 6f 72 6b 20 75 6e |diff.elc| work un|
|00000a40| 64 65 72 20 62 6f 74 68 | 20 45 6d 61 63 73 65 6e |der both| Emacsen|
|00000a50| 2e 22 5d 29 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |."])).(d|efalias |
|00000a60| 27 65 64 69 66 66 2d 65 | 76 61 6c 2d 69 6e 2d 62 |'ediff-e|val-in-b|
|00000a70| 75 66 66 65 72 20 27 28 | 6d 61 63 72 6f 20 2e 20 |uffer '(|macro . |
|00000a80| 23 5b 28 62 75 66 66 65 | 72 20 26 72 65 73 74 20 |#[(buffe|r &rest |
|00000a90| 66 6f 72 6d 73 29 20 22 | c0 c1 c2 c3 5c 66 44 c5 |forms) "|....\fD.|
|00000aa0| c6 c7 5c 66 44 0e 08 42 | 42 c9 42 42 ca 42 42 42 |..\fD..B|B.BB.BBB|
|00000ab0| 45 87 22 20 5b 6c 65 74 | 20 28 28 53 74 61 72 74 |E." [let| ((Start|
|00000ac0| 42 75 66 66 65 72 20 28 | 63 75 72 72 65 6e 74 2d |Buffer (|current-|
|00000ad0| 62 75 66 66 65 72 29 29 | 29 20 69 66 20 65 64 69 |buffer))|) if edi|
|00000ae0| 66 66 2d 62 75 66 66 65 | 72 2d 6c 69 76 65 2d 70 |ff-buffe|r-live-p|
|00000af0| 20 62 75 66 66 65 72 20 | 75 6e 77 69 6e 64 2d 70 | buffer |unwind-p|
|00000b00| 72 6f 74 65 63 74 20 70 | 72 6f 67 6e 20 73 65 74 |rotect p|rogn set|
|00000b10| 2d 62 75 66 66 65 72 20 | 66 6f 72 6d 73 20 28 28 |-buffer |forms ((|
|00000b20| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00000b30| 42 75 66 66 65 72 29 29 | 20 28 28 62 65 65 70 20 |Buffer))| ((beep |
|00000b40| 31 29 20 28 6d 65 73 73 | 61 67 65 20 22 59 6f 75 |1) (mess|age "You|
|00000b50| 20 73 65 65 6d 20 74 6f | 20 68 61 76 65 20 6b 69 | seem to| have ki|
|00000b60| 6c 6c 65 64 20 61 6e 20 | 65 73 73 65 6e 74 69 61 |lled an |essentia|
|00000b70| 6c 20 45 64 69 66 66 20 | 62 75 66 66 65 72 2d 2d |l Ediff |buffer--|
|00000b80| 2d 71 75 69 74 21 22 29 | 29 5d 20 38 20 22 5c 0a |-quit!")|)] 8 "\.|
|00000b90| 4d 61 63 72 6f 20 74 6f | 20 73 77 69 74 63 68 20 |Macro to| switch |
|00000ba0| 74 6f 20 42 55 46 46 45 | 52 2c 20 65 76 61 6c 75 |to BUFFE|R, evalu|
|00000bb0| 61 74 65 20 46 4f 52 4d | 53 2c 20 72 65 74 75 72 |ate FORM|S, retur|
|00000bc0| 6e 73 20 74 6f 20 6f 72 | 69 67 69 6e 61 6c 20 62 |ns to or|iginal b|
|00000bd0| 75 66 66 65 72 2e 0a 44 | 69 66 66 65 72 73 20 66 |uffer..D|iffers f|
|00000be0| 72 6f 6d 20 60 73 61 76 | 65 2d 65 78 63 75 72 73 |rom `sav|e-excurs|
|00000bf0| 69 6f 6e 27 20 69 6e 20 | 74 68 61 74 20 69 74 20 |ion' in |that it |
|00000c00| 64 6f 65 73 6e 27 74 20 | 73 61 76 65 20 74 68 65 |doesn't |save the|
|00000c10| 20 70 6f 69 6e 74 20 61 | 6e 64 20 6d 61 72 6b 2e | point a|nd mark.|
|00000c20| 0a 54 68 69 73 20 69 73 | 20 65 73 73 65 6e 74 69 |.This is| essenti|
|00000c30| 61 6c 6c 79 20 60 65 6d | 65 72 67 65 2d 65 76 61 |ally `em|erge-eva|
|00000c40| 6c 2d 69 6e 2d 62 75 66 | 66 65 72 27 20 77 69 74 |l-in-buf|fer' wit|
|00000c50| 68 20 74 68 65 20 74 65 | 73 74 20 66 6f 72 20 6c |h the te|st for l|
|00000c60| 69 76 65 20 62 75 66 66 | 65 72 73 2e 22 5d 29 29 |ive buff|ers."]))|
|00000c70| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00000c80| 66 2d 6d 6f 64 65 20 23 | 5b 6e 69 6c 20 22 c0 20 |f-mode #|[nil ". |
|00000c90| 88 c1 12 c3 89 14 87 22 | 20 5b 6b 69 6c 6c 2d 61 |......."| [kill-a|
|00000ca0| 6c 6c 2d 6c 6f 63 61 6c | 2d 76 61 72 69 61 62 6c |ll-local|-variabl|
|00000cb0| 65 73 20 65 64 69 66 66 | 2d 6d 6f 64 65 20 6d 61 |es ediff|-mode ma|
|00000cc0| 6a 6f 72 2d 6d 6f 64 65 | 20 22 45 64 69 66 66 22 |jor-mode| "Ediff"|
|00000cd0| 20 6d 6f 64 65 2d 6e 61 | 6d 65 5d 20 32 20 22 5c | mode-na|me] 2 "\|
|00000ce0| 0a 45 64 69 66 66 20 6d | 6f 64 65 20 69 73 20 75 |.Ediff m|ode is u|
|00000cf0| 73 65 64 20 62 79 20 74 | 68 65 20 45 64 69 66 66 |sed by t|he Ediff|
|00000d00| 20 66 69 6c 65 2d 64 69 | 66 66 65 72 65 6e 63 65 | file-di|fference|
|00000d10| 20 70 61 63 6b 61 67 65 | 2e 0a 49 74 20 69 73 20 | package|..It is |
|00000d20| 65 6e 74 65 72 65 64 20 | 6f 6e 6c 79 20 74 68 72 |entered |only thr|
|00000d30| 6f 75 67 68 20 6f 6e 65 | 20 6f 66 20 74 68 65 20 |ough one| of the |
|00000d40| 66 6f 6c 6c 6f 77 69 6e | 67 20 63 6f 6d 6d 61 6e |followin|g comman|
|00000d50| 64 73 3a 0a 09 60 65 64 | 69 66 66 27 0a 09 60 65 |ds:..`ed|iff'..`e|
|00000d60| 64 69 66 66 2d 66 69 6c | 65 73 27 0a 09 60 65 64 |diff-fil|es'..`ed|
|00000d70| 69 66 66 2d 62 75 66 66 | 65 72 73 27 0a 09 60 65 |iff-buff|ers'..`e|
|00000d80| 70 61 74 63 68 27 0a 09 | 60 65 64 69 66 66 2d 70 |patch'..|`ediff-p|
|00000d90| 61 74 63 68 2d 66 69 6c | 65 27 0a 09 60 65 64 69 |atch-fil|e'..`edi|
|00000da0| 66 66 2d 70 61 74 63 68 | 2d 62 75 66 66 65 72 27 |ff-patch|-buffer'|
|00000db0| 0a 09 60 65 70 61 74 63 | 68 2d 62 75 66 66 65 72 |..`epatc|h-buffer|
|00000dc0| 27 0a 09 60 76 63 2d 65 | 64 69 66 66 27 0a 09 60 |'..`vc-e|diff'..`|
|00000dd0| 72 63 73 2d 65 64 69 66 | 66 27 0a 0a 43 6f 6d 6d |rcs-edif|f'..Comm|
|00000de0| 61 6e 64 73 3a 0a 5c 5c | 7b 65 64 69 66 66 2d 6d |ands:.\\|{ediff-m|
|00000df0| 6f 64 65 2d 6d 61 70 7d | 22 20 6e 69 6c 5d 29 0a |ode-map}|" nil]).|
|00000e00| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 62 65 |(defvar |ediff-be|
|00000e10| 66 6f 72 65 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |fore-set|up-windo|
|00000e20| 77 73 2d 68 6f 6f 6b 73 | 20 6e 69 6c 20 22 5c 0a |ws-hooks| nil "\.|
|00000e30| 2a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 62 65 |*Hooks t|o run be|
|00000e40| 66 6f 72 65 20 45 64 69 | 66 66 20 73 65 74 73 20 |fore Edi|ff sets |
|00000e50| 69 74 73 20 6f 77 6e 20 | 77 69 6e 64 6f 77 20 63 |its own |window c|
|00000e60| 6f 6e 66 69 67 2e 20 0a | 54 68 69 73 20 63 61 6e |onfig. .|This can|
|00000e70| 20 62 65 20 75 73 65 64 | 20 74 6f 20 73 61 76 65 | be used| to save|
|00000e80| 20 74 68 65 20 70 72 65 | 76 69 6f 75 73 20 77 69 | the pre|vious wi|
|00000e90| 6e 64 6f 77 20 63 6f 6e | 66 69 67 2c 20 77 68 69 |ndow con|fig, whi|
|00000ea0| 63 68 20 63 61 6e 20 62 | 65 20 72 65 73 74 6f 72 |ch can b|e restor|
|00000eb0| 65 64 0a 6f 6e 20 65 64 | 69 66 66 2d 71 75 69 74 |ed.on ed|iff-quit|
|00000ec0| 20 6f 72 20 65 64 69 66 | 66 2d 73 75 73 70 65 6e | or edif|f-suspen|
|00000ed0| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |d.").(de|fvar edi|
|00000ee0| 66 66 2d 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ff-start|up-hooks|
|00000ef0| 20 6e 69 6c 20 22 5c 0a | 2a 48 6f 6f 6b 73 20 74 | nil "\.|*Hooks t|
|00000f00| 6f 20 72 75 6e 20 69 6e | 20 74 68 65 20 63 6f 6e |o run in| the con|
|00000f10| 74 72 6f 6c 20 62 75 66 | 66 65 72 20 61 66 74 65 |trol buf|fer afte|
|00000f20| 72 20 45 64 69 66 66 20 | 68 61 73 20 62 65 65 6e |r Ediff |has been|
|00000f30| 20 73 65 74 20 75 70 2e | 22 29 0a 28 64 65 66 76 | set up.|").(defv|
|00000f40| 61 72 20 65 64 69 66 66 | 2d 73 65 6c 65 63 74 2d |ar ediff|-select-|
|00000f50| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|00000f60| 6f 6b 73 20 74 6f 20 72 | 75 6e 20 61 66 74 65 72 |oks to r|un after|
|00000f70| 20 61 20 64 69 66 66 65 | 72 65 6e 63 65 20 68 61 | a diffe|rence ha|
|00000f80| 73 20 62 65 65 6e 20 73 | 65 6c 65 63 74 65 64 2e |s been s|elected.|
|00000f90| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|00000fa0| 2d 75 6e 73 65 6c 65 63 | 74 2d 68 6f 6f 6b 73 20 |-unselec|t-hooks |
|00000fb0| 6e 69 6c 20 22 5c 0a 2a | 48 6f 6f 6b 73 20 74 6f |nil "\.*|Hooks to|
|00000fc0| 20 72 75 6e 20 61 66 74 | 65 72 20 61 20 64 69 66 | run aft|er a dif|
|00000fd0| 66 65 72 65 6e 63 65 20 | 68 61 73 20 62 65 65 6e |ference |has been|
|00000fe0| 20 75 6e 73 65 6c 65 63 | 74 65 64 2e 22 29 0a 28 | unselec|ted.").(|
|00000ff0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 70 72 65 |defvar e|diff-pre|
|00001000| 70 61 72 65 2d 62 75 66 | 66 65 72 2d 68 6f 6f 6b |pare-buf|fer-hook|
|00001010| 73 20 6e 69 6c 20 22 5c | 0a 2a 48 6f 6f 6b 73 20 |s nil "\|.*Hooks |
|00001020| 63 61 6c 6c 65 64 20 61 | 66 74 65 72 20 62 75 66 |called a|fter buf|
|00001030| 66 65 72 73 20 41 20 61 | 6e 64 20 42 20 61 72 65 |fers A a|nd B are|
|00001040| 20 73 65 74 20 75 70 2e | 22 29 0a 28 64 65 66 76 | set up.|").(defv|
|00001050| 61 72 20 65 64 69 66 66 | 2d 6c 6f 61 64 2d 68 6f |ar ediff|-load-ho|
|00001060| 6f 6b 73 20 6e 69 6c 20 | 22 5c 0a 2a 48 6f 6f 6b |oks nil |"\.*Hook|
|00001070| 20 72 75 6e 20 61 66 74 | 65 72 20 45 64 69 66 66 | run aft|er Ediff|
|00001080| 20 69 73 20 6c 6f 61 64 | 65 64 2e 20 20 43 61 6e | is load|ed. Can|
|00001090| 20 62 65 20 75 73 65 64 | 20 74 6f 20 63 68 61 6e | be used| to chan|
|000010a0| 67 65 20 64 65 66 61 75 | 6c 74 73 2e 22 29 0a 28 |ge defau|lts.").(|
|000010b0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 75 73 |defvar e|diff-sus|
|000010c0| 70 65 6e 64 2d 68 6f 6f | 6b 73 20 28 6c 69 73 74 |pend-hoo|ks (list|
|000010d0| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 64 65 | (quote |ediff-de|
|000010e0| 66 61 75 6c 74 2d 73 75 | 73 70 65 6e 64 2d 68 6f |fault-su|spend-ho|
|000010f0| 6f 6b 29 29 20 22 5c 0a | 2a 48 6f 6f 6b 73 20 74 |ok)) "\.|*Hooks t|
|00001100| 6f 20 72 75 6e 20 69 6e | 20 74 68 65 20 45 64 69 |o run in| the Edi|
|00001110| 66 66 20 63 6f 6e 74 72 | 6f 6c 20 62 75 66 66 65 |ff contr|ol buffe|
|00001120| 72 20 77 68 65 6e 20 45 | 64 69 66 66 20 69 73 20 |r when E|diff is |
|00001130| 73 75 73 70 65 6e 64 65 | 64 2e 22 29 0a 28 64 65 |suspende|d.").(de|
|00001140| 66 76 61 72 20 65 64 69 | 66 66 2d 71 75 69 74 2d |fvar edi|ff-quit-|
|00001150| 68 6f 6f 6b 73 20 28 6c | 69 73 74 20 28 71 75 6f |hooks (l|ist (quo|
|00001160| 74 65 20 65 64 69 66 66 | 2d 64 65 66 61 75 6c 74 |te ediff|-default|
|00001170| 2d 71 75 69 74 2d 68 6f | 6f 6b 29 29 20 22 5c 0a |-quit-ho|ok)) "\.|
|00001180| 2a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 69 6e |*Hooks t|o run in|
|00001190| 20 74 68 65 20 45 64 69 | 66 66 20 63 6f 6e 74 72 | the Edi|ff contr|
|000011a0| 6f 6c 20 62 75 66 66 65 | 72 20 61 66 74 65 72 20 |ol buffe|r after |
|000011b0| 66 69 6e 69 73 68 69 6e | 67 20 45 64 69 66 66 2e |finishin|g Ediff.|
|000011c0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|000011d0| c1 21 88 c0 c2 21 88 c3 | 14 c5 16 06 c0 87 22 20 |.!...!..|......" |
|000011e0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000011f0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 6c 6f 63 61 |uffer-lo|cal loca|
|00001200| 6c 2d 77 72 69 74 65 2d | 66 69 6c 65 2d 68 6f 6f |l-write-|file-hoo|
|00001210| 6b 73 20 62 65 66 6f 72 | 65 2d 63 68 61 6e 67 65 |ks befor|e-change|
|00001220| 2d 66 75 6e 63 74 69 6f | 6e 20 22 20 20 20 20 4d |-functio|n " M|
|00001230| 6f 76 69 6e 67 20 61 72 | 6f 75 6e 64 20 20 20 20 |oving ar|ound |
|00001240| 20 20 7c 20 20 20 20 20 | 54 6f 67 67 6c 69 6e 67 | | |Toggling|
|00001250| 20 66 65 61 74 75 72 65 | 73 20 20 20 20 20 7c 20 | feature|s | |
|00001260| 20 20 20 20 20 20 4d 69 | 73 63 65 6c 6c 61 6e 65 | Mi|scellane|
|00001270| 6f 75 73 5c 6e 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |ous\n===|========|
|00001280| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 7c 3d 3d 3d |========|====|===|
|00001290| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000012a0| 3d 3d 3d 3d 3d 3d 3d 3d | 7c 3d 3d 3d 3d 3d 3d 3d |========||=======|
|000012b0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000012c0| 3d 3d 3d 3d 5c 6e 70 2c | 44 45 4c 20 2d 70 72 65 |====\np,|DEL -pre|
|000012d0| 76 69 6f 75 73 20 64 69 | 66 66 20 20 20 7c 20 20 |vious di|ff | |
|000012e0| 20 20 20 73 20 2d 76 65 | 72 74 2f 68 6f 72 69 7a | s -ve|rt/horiz|
|000012f0| 20 73 70 6c 69 74 20 20 | 20 7c 20 61 62 2f 62 61 | split | | ab/ba|
|00001300| 20 2d 63 6f 70 79 20 64 | 69 66 66 20 41 2d 3e 42 | -copy d|iff A->B|
|00001310| 2f 42 2d 3e 41 5c 6e 6e | 2c 53 50 43 20 2d 6e 65 |/B->A\nn|,SPC -ne|
|00001320| 78 74 20 64 69 66 66 20 | 20 20 20 20 20 20 7c 20 |xt diff | | |
|00001330| 20 20 20 20 68 20 2d 68 | 69 6c 69 74 69 6e 67 20 | h -h|iliting |
|00001340| 20 20 20 20 20 20 20 20 | 20 20 7c 20 72 61 2f 72 | | | ra/r|
|00001350| 62 20 2d 72 65 73 74 6f | 72 65 20 64 69 66 66 20 |b -resto|re diff |
|00001360| 69 6e 20 41 2f 42 5c 6e | 20 20 20 20 6a 20 2d 6a |in A/B\n| j -j|
|00001370| 75 6d 70 20 74 6f 20 64 | 69 66 66 20 20 20 20 7c |ump to d|iff ||
|00001380| 20 20 20 20 20 40 20 2d | 61 75 74 6f 2d 72 65 66 | @ -|auto-ref|
|00001390| 69 6e 69 6e 67 20 20 20 | 20 20 20 7c 20 20 20 20 |ining | | |
|000013a0| 20 2a 20 2d 72 65 66 69 | 6e 65 20 64 69 66 66 5c | * -refi|ne diff\|
|000013b0| 6e 67 61 2f 67 62 20 2d | 74 6f 20 70 6f 69 6e 74 |nga/gb -|to point|
|000013c0| 20 69 6e 20 41 2f 42 20 | 7c 2d 2d 2d 2d 2d 2d 2d | in A/B ||-------|
|000013d0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000013e0| 2d 2d 2d 2d 7c 20 20 20 | 20 20 21 20 2d 72 65 63 |----| | ! -rec|
|000013f0| 6f 6d 70 75 74 65 20 64 | 69 66 66 73 5c 6e 20 20 |ompute d|iffs\n |
|00001400| 20 20 63 20 2d 72 65 63 | 65 6e 74 65 72 20 20 20 | c -rec|enter |
|00001410| 20 20 20 20 20 7c 20 20 | 20 20 23 23 20 2d 73 6b | | | ## -sk|
|00001420| 69 70 20 77 68 69 74 65 | 73 70 61 63 65 20 20 20 |ip white|space |
|00001430| 20 7c 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d | |------|--------|
|00001440| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 5c 6e 20 |--------|-----\n |
|00001450| 20 76 2f 56 20 2d 73 63 | 72 6f 6c 6c 20 75 70 2f | v/V -sc|roll up/|
|00001460| 64 6f 77 6e 20 20 7c 20 | 23 66 2f 23 68 20 2d 66 |down | |#f/#h -f|
|00001470| 6f 63 75 73 2f 68 69 64 | 65 20 72 65 67 69 6f 6e |ocus/hid|e region|
|00001480| 73 20 7c 20 77 61 2f 77 | 62 20 2d 73 61 76 65 20 |s | wa/w|b -save |
|00001490| 62 75 66 20 41 2f 42 5c | 6e 20 20 3c 2f 3e 20 2d |buf A/B\|n </> -|
|000014a0| 73 63 72 6f 6c 6c 20 6c | 66 74 2f 72 67 68 74 20 |scroll l|ft/rght |
|000014b0| 7c 20 20 20 41 2f 42 20 | 2d 72 65 61 64 2d 6f 6e || A/B |-read-on|
|000014c0| 6c 79 20 62 75 66 20 41 | 2f 42 20 20 7c 20 20 20 |ly buf A|/B | |
|000014d0| 20 77 66 20 2d 73 61 76 | 65 20 64 69 66 66 20 6f | wf -sav|e diff o|
|000014e0| 75 74 70 75 74 5c 6e 3d | 3d 3d 3d 3d 3d 3d 3d 3d |utput\n=|========|
|000014f0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 7c 3d |========|======|=|
|00001500| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00001510| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 7c 3d 3d 3d 3d 3d |========|==|=====|
|00001520| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00001530| 3d 3d 3d 3d 3d 3d 5c 6e | 20 20 20 20 69 20 2d 73 |======\n| i -s|
|00001540| 74 61 74 75 73 20 69 6e | 66 6f 20 20 20 20 20 7c |tatus in|fo ||
|00001550| 20 20 20 20 20 3f 20 2d | 74 6f 67 67 6c 65 20 68 | ? -|toggle h|
|00001560| 65 6c 70 20 77 69 6e 64 | 6f 77 20 7c 20 20 20 7a |elp wind|ow | z|
|00001570| 2f 71 20 2d 73 75 73 70 | 65 6e 64 2f 71 75 69 74 |/q -susp|end/quit|
|00001580| 20 45 64 69 66 66 22 20 | 65 64 69 66 66 2d 68 65 | Ediff" |ediff-he|
|00001590| 6c 70 2d 6d 65 73 73 61 | 67 65 2d 6c 6f 6e 67 20 |lp-messa|ge-long |
|000015a0| 22 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |" | |
|000015b0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 3f 20 | | ? |
|000015c0| 2d 20 74 6f 67 67 6c 65 | 20 68 65 6c 70 20 77 69 |- toggle| help wi|
|000015d0| 6e 64 6f 77 22 20 65 64 | 69 66 66 2d 68 65 6c 70 |ndow" ed|iff-help|
|000015e0| 2d 6d 65 73 73 61 67 65 | 2d 73 68 6f 72 74 5d 20 |-message|-short] |
|000015f0| 32 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |2).(defv|ar ediff|
|00001600| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 65 64 |-help-me|ssage ed|
|00001610| 69 66 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |iff-help|-message|
|00001620| 2d 6c 6f 6e 67 20 22 5c | 0a 2a 54 68 65 20 61 63 |-long "\|.*The ac|
|00001630| 74 75 61 6c 20 68 65 6c | 70 20 6d 65 73 73 61 67 |tual hel|p messag|
|00001640| 65 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |e.").(de|fvar edi|
|00001650| 66 66 2d 64 69 66 66 2d | 70 72 6f 67 72 61 6d 20 |ff-diff-|program |
|00001660| 22 64 69 66 66 22 20 22 | 5c 0a 2a 4e 61 6d 65 20 |"diff" "|\.*Name |
|00001670| 6f 66 20 74 68 65 20 70 | 72 6f 67 72 61 6d 20 74 |of the p|rogram t|
|00001680| 68 61 74 20 63 6f 6d 70 | 61 72 65 73 20 74 77 6f |hat comp|ares two|
|00001690| 20 66 69 6c 65 73 2e 22 | 29 0a 28 64 65 66 76 61 | files."|).(defva|
|000016a0| 72 20 65 64 69 66 66 2d | 64 69 66 66 2d 6f 70 74 |r ediff-|diff-opt|
|000016b0| 69 6f 6e 73 20 22 22 20 | 22 5c 0a 2a 4f 70 74 69 |ions "" |"\.*Opti|
|000016c0| 6f 6e 73 20 74 6f 20 70 | 61 73 73 20 74 6f 20 60 |ons to p|ass to `|
|000016d0| 65 64 69 66 66 2d 64 69 | 66 66 2d 70 72 6f 67 72 |ediff-di|ff-progr|
|000016e0| 61 6d 27 2e 20 0a 49 66 | 20 64 69 66 66 28 31 29 |am'. .If| diff(1)|
|000016f0| 20 69 73 20 75 73 65 64 | 20 61 73 20 60 65 64 69 | is used| as `edi|
|00001700| 66 66 2d 64 69 66 66 2d | 70 72 6f 67 72 61 6d 27 |ff-diff-|program'|
|00001710| 2c 20 74 68 65 6e 20 74 | 68 65 20 6d 6f 73 74 20 |, then t|he most |
|00001720| 75 73 65 66 75 6c 20 6f | 70 74 69 6f 6e 73 20 61 |useful o|ptions a|
|00001730| 72 65 0a 60 2d 77 27 2c | 20 74 6f 20 69 67 6e 6f |re.`-w',| to igno|
|00001740| 72 65 20 73 70 61 63 65 | 2c 20 61 6e 64 20 60 2d |re space|, and `-|
|00001750| 69 27 2c 20 74 6f 20 69 | 67 6e 6f 72 65 20 63 61 |i', to i|gnore ca|
|00001760| 73 65 20 6f 66 20 6c 65 | 74 74 65 72 73 2e 22 29 |se of le|tters.")|
|00001770| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 66 |.(defvar| ediff-f|
|00001780| 6f 72 77 61 72 64 2d 77 | 6f 72 64 2d 66 75 6e 63 |orward-w|ord-func|
|00001790| 74 69 6f 6e 20 28 71 75 | 6f 74 65 20 65 64 69 66 |tion (qu|ote edif|
|000017a0| 66 2d 66 6f 72 77 61 72 | 64 2d 77 6f 72 64 29 20 |f-forwar|d-word) |
|000017b0| 22 5c 0a 2a 46 75 6e 63 | 74 69 6f 6e 20 74 6f 20 |"\.*Func|tion to |
|000017c0| 63 61 6c 6c 20 74 6f 20 | 6d 6f 76 65 20 74 6f 20 |call to |move to |
|000017d0| 74 68 65 20 6e 65 78 74 | 20 77 6f 72 64 2e 0a 55 |the next| word..U|
|000017e0| 73 65 64 20 66 6f 72 20 | 73 70 6c 69 74 74 69 6e |sed for |splittin|
|000017f0| 67 20 64 69 66 66 65 72 | 65 6e 63 65 20 72 65 67 |g differ|ence reg|
|00001800| 69 6f 6e 73 20 69 6e 74 | 6f 20 69 6e 64 69 76 69 |ions int|o indivi|
|00001810| 64 75 61 6c 20 77 6f 72 | 64 73 2e 22 29 0a 28 64 |dual wor|ds.").(d|
|00001820| 65 66 76 61 72 20 65 64 | 69 66 66 2d 66 69 6e 65 |efvar ed|iff-fine|
|00001830| 2d 64 69 66 66 2d 70 72 | 6f 67 72 61 6d 20 22 64 |-diff-pr|ogram "d|
|00001840| 69 66 66 22 20 22 5c 0a | 2a 4e 61 6d 65 20 6f 66 |iff" "\.|*Name of|
|00001850| 20 74 68 65 20 70 72 6f | 67 72 61 6d 20 74 68 61 | the pro|gram tha|
|00001860| 74 20 63 6f 6d 70 61 72 | 65 73 20 74 68 65 20 63 |t compar|es the c|
|00001870| 75 72 72 65 6e 74 20 64 | 69 66 66 20 72 65 67 69 |urrent d|iff regi|
|00001880| 6f 6e 73 20 66 6f 72 20 | 66 69 6e 65 20 64 69 66 |ons for |fine dif|
|00001890| 66 65 72 65 6e 63 65 73 | 2e 0a 20 20 0a 54 68 69 |ferences|.. .Thi|
|000018a0| 73 20 70 72 6f 67 72 61 | 6d 20 73 68 6f 75 6c 64 |s progra|m should|
|000018b0| 20 70 72 6f 64 75 63 65 | 20 6f 75 74 70 75 74 20 | produce| output |
|000018c0| 69 6e 20 74 68 65 20 66 | 6f 72 6d 61 74 20 6f 66 |in the f|ormat of|
|000018d0| 20 64 69 66 66 2e 20 4f | 6e 65 20 63 6f 75 6c 64 | diff. O|ne could|
|000018e0| 0a 70 6f 73 73 69 62 6c | 79 20 75 73 65 20 60 73 |.possibl|y use `s|
|000018f0| 70 69 66 66 27 20 68 65 | 72 65 20 69 66 20 61 70 |piff' he|re if ap|
|00001900| 70 72 6f 70 72 69 61 74 | 65 20 6f 70 74 69 6f 6e |propriat|e option|
|00001910| 73 20 61 72 65 20 73 65 | 74 2e 22 29 0a 28 64 65 |s are se|t.").(de|
|00001920| 66 76 61 72 20 65 64 69 | 66 66 2d 66 69 6e 65 2d |fvar edi|ff-fine-|
|00001930| 64 69 66 66 2d 6f 70 74 | 69 6f 6e 73 20 22 22 20 |diff-opt|ions "" |
|00001940| 22 5c 0a 2a 4f 70 74 69 | 6f 6e 73 20 74 6f 20 70 |"\.*Opti|ons to p|
|00001950| 61 73 73 20 74 6f 20 60 | 65 64 69 66 66 2d 66 69 |ass to `|ediff-fi|
|00001960| 6e 65 2d 64 69 66 66 2d | 70 72 6f 67 72 61 6d 27 |ne-diff-|program'|
|00001970| 2e 0a 49 66 20 64 69 66 | 66 28 31 29 20 69 73 20 |..If dif|f(1) is |
|00001980| 75 73 65 64 20 61 73 20 | 60 65 64 69 66 66 2d 64 |used as |`ediff-d|
|00001990| 69 66 66 2d 70 72 6f 67 | 72 61 6d 27 2c 20 74 68 |iff-prog|ram', th|
|000019a0| 65 6e 20 74 68 65 20 6d | 6f 73 74 20 75 73 65 66 |en the m|ost usef|
|000019b0| 75 6c 20 6f 70 74 69 6f | 6e 73 20 61 72 65 0a 60 |ul optio|ns are.`|
|000019c0| 2d 77 27 2c 20 74 6f 20 | 69 67 6e 6f 72 65 20 73 |-w', to |ignore s|
|000019d0| 70 61 63 65 2c 20 61 6e | 64 20 60 2d 69 27 2c 20 |pace, an|d `-i', |
|000019e0| 74 6f 20 69 67 6e 6f 72 | 65 20 63 61 73 65 20 6f |to ignor|e case o|
|000019f0| 66 20 6c 65 74 74 65 72 | 73 2e 22 29 0a 28 64 65 |f letter|s.").(de|
|00001a00| 66 76 61 72 20 65 64 69 | 66 66 2d 77 68 69 74 65 |fvar edi|ff-white|
|00001a10| 73 70 61 63 65 20 22 20 | 5c 6e 09 5c 6e 22 20 22 |space " |\n.\n" "|
|00001a20| 5c 0a 2a 57 68 69 74 65 | 20 73 70 61 63 65 2e 20 |\.*White| space. |
|00001a30| 55 73 65 64 20 74 6f 20 | 73 70 6c 69 74 20 73 74 |Used to |split st|
|00001a40| 72 69 6e 67 73 20 69 6e | 74 6f 20 77 6f 72 64 73 |rings in|to words|
|00001a50| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |.").(def|var edif|
|00001a60| 66 2d 77 6f 72 64 2d 31 | 20 22 61 2d 7a 41 2d 5a |f-word-1| "a-zA-Z|
|00001a70| 2d 2d 2d 5f 60 27 2e 3f | 21 3a 22 20 22 5c 0a 2a |---_`'.?|!:" "\.*|
|00001a80| 43 68 61 72 61 63 74 65 | 72 73 20 63 6f 6e 73 74 |Characte|rs const|
|00001a90| 69 74 75 74 69 6e 67 20 | 74 79 70 65 20 31 20 77 |ituting |type 1 w|
|00001aa0| 6f 72 64 73 2e 0a 20 20 | 0a 45 64 69 66 66 20 69 |ords.. |.Ediff i|
|00001ab0| 73 20 75 73 69 6e 67 20 | 61 20 76 65 72 79 20 73 |s using |a very s|
|00001ac0| 69 6d 70 6c 65 20 73 63 | 68 65 6d 61 20 66 6f 72 |imple sc|hema for|
|00001ad0| 20 73 70 6c 69 74 74 69 | 6e 67 20 74 65 78 74 20 | splitti|ng text |
|00001ae0| 69 6e 74 6f 20 77 6f 72 | 64 73 2c 20 77 68 69 63 |into wor|ds, whic|
|00001af0| 68 20 69 73 0a 75 73 65 | 64 20 74 6f 20 64 65 74 |h is.use|d to det|
|00001b00| 65 72 6d 69 6e 65 20 66 | 69 6e 65 20 64 69 66 66 |ermine f|ine diff|
|00001b10| 65 72 65 6e 63 65 73 20 | 62 65 74 77 65 65 6e 20 |erences |between |
|00001b20| 72 65 67 69 6f 6e 73 2e | 20 54 68 65 72 65 20 61 |regions.| There a|
|00001b30| 72 65 20 74 77 6f 20 74 | 79 70 65 73 20 6f 66 0a |re two t|ypes of.|
|00001b40| 77 6f 72 64 73 2e 20 4f | 6e 65 20 63 6f 6e 73 69 |words. O|ne consi|
|00001b50| 73 74 73 20 65 6e 74 69 | 72 65 6c 79 20 6f 75 74 |sts enti|rely out|
|00001b60| 20 6f 66 20 63 68 61 72 | 61 63 74 65 72 73 20 69 | of char|acters i|
|00001b70| 6e 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 31 27 |n `ediff|-word-1'|
|00001b80| 20 20 61 6e 64 0a 61 6e | 6f 74 68 65 72 20 6f 75 | and.an|other ou|
|00001b90| 74 20 6f 66 20 63 68 61 | 72 61 63 74 65 72 73 20 |t of cha|racters |
|00001ba0| 6d 61 74 63 68 69 6e 67 | 20 60 65 64 69 66 66 2d |matching| `ediff-|
|00001bb0| 77 6f 72 64 2d 31 27 2e | 22 29 0a 28 64 65 66 76 |word-1'.|").(defv|
|00001bc0| 61 72 20 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 20 |ar ediff|-word-2 |
|00001bd0| 22 5e 61 2d 7a 41 2d 5a | 2d 2d 2d 5f 60 27 2e 3f |"^a-zA-Z|---_`'.?|
|00001be0| 21 3a 20 09 5c 6e 5c 6e | 22 20 22 5c 0a 2a 43 68 |!: .\n\n|" "\.*Ch|
|00001bf0| 61 72 61 63 74 65 72 73 | 20 6d 61 74 63 68 69 6e |aracters| matchin|
|00001c00| 67 20 74 68 69 73 20 72 | 65 67 65 78 70 20 63 6f |g this r|egexp co|
|00001c10| 6e 73 74 69 74 75 74 65 | 20 77 6f 72 64 73 20 6f |nstitute| words o|
|00001c20| 66 20 74 79 70 65 20 32 | 2e 0a 53 65 65 20 60 65 |f type 2|..See `e|
|00001c30| 64 69 66 66 2d 77 6f 72 | 64 2d 31 27 20 66 6f 72 |diff-wor|d-1' for|
|00001c40| 20 6d 6f 72 65 20 64 65 | 74 61 69 6c 73 2e 22 29 | more de|tails.")|
|00001c50| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 73 |.(defvar| ediff-s|
|00001c60| 6b 69 70 2d 64 69 66 66 | 2d 72 65 67 69 6f 6e 2d |kip-diff|-region-|
|00001c70| 66 75 6e 63 74 69 6f 6e | 20 28 71 75 6f 74 65 20 |function| (quote |
|00001c80| 65 64 69 66 66 2d 73 68 | 6f 77 2d 61 6c 6c 2d 64 |ediff-sh|ow-all-d|
|00001c90| 69 66 66 73 29 20 22 5c | 0a 46 75 6e 63 74 69 6f |iffs) "\|.Functio|
|00001ca0| 6e 20 74 68 61 74 20 64 | 65 74 65 72 6d 69 6e 65 |n that d|etermine|
|00001cb0| 73 20 74 68 65 20 6e 65 | 78 74 2f 70 72 65 76 69 |s the ne|xt/previ|
|00001cc0| 6f 75 73 20 64 69 66 66 | 20 72 65 67 69 6f 6e 20 |ous diff| region |
|00001cd0| 74 6f 20 73 68 6f 77 2e | 0a 53 68 6f 75 6c 64 20 |to show.|.Should |
|00001ce0| 72 65 74 75 72 6e 20 74 | 20 66 6f 72 20 72 65 67 |return t| for reg|
|00001cf0| 69 6f 6e 73 20 74 6f 20 | 62 65 20 69 67 6e 6f 72 |ions to |be ignor|
|00001d00| 65 64 20 61 6e 64 20 6e | 69 6c 20 6f 74 68 65 72 |ed and n|il other|
|00001d10| 77 69 73 65 2e 0a 54 68 | 69 73 20 66 75 6e 63 74 |wise..Th|is funct|
|00001d20| 69 6f 6e 20 67 65 74 73 | 20 61 20 72 65 67 69 6f |ion gets| a regio|
|00001d30| 6e 20 6e 75 6d 62 65 72 | 20 61 73 20 61 6e 20 61 |n number| as an a|
|00001d40| 72 67 75 6d 65 6e 74 2e | 20 54 68 65 20 72 65 67 |rgument.| The reg|
|00001d50| 69 6f 6e 20 6e 75 6d 62 | 65 72 0a 69 73 20 74 68 |ion numb|er.is th|
|00001d60| 65 20 6f 6e 65 20 75 73 | 65 64 20 69 6e 74 65 72 |e one us|ed inter|
|00001d70| 6e 61 6c 6c 79 20 62 79 | 20 45 64 69 66 66 2e 20 |nally by| Ediff. |
|00001d80| 49 74 20 69 73 20 31 20 | 6c 65 73 73 20 74 68 61 |It is 1 |less tha|
|00001d90| 6e 20 74 68 65 20 6e 75 | 6d 62 65 72 20 73 65 65 |n the nu|mber see|
|00001da0| 6e 0a 62 79 20 74 68 65 | 20 75 73 65 72 2e 22 29 |n.by the| user.")|
|00001db0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00001dc0| 88 c2 c1 c3 c4 0d 5c 22 | 83 11 00 c6 82 12 00 c7 |......\"|........|
|00001dd0| c8 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00001de0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00001df0| 20 65 64 69 66 66 2d 73 | 6b 69 70 2d 64 69 66 66 | ediff-s|kip-diff|
|00001e00| 2d 72 65 67 69 6f 6e 2d | 66 75 6e 63 74 69 6f 6e |-region-|function|
|00001e10| 20 70 75 74 20 73 74 72 | 69 6e 67 2d 6d 61 74 63 | put str|ing-matc|
|00001e20| 68 20 22 4c 75 63 69 64 | 22 20 65 6d 61 63 73 2d |h "Lucid|" emacs-|
|00001e30| 76 65 72 73 69 6f 6e 20 | 70 65 72 6d 61 6e 65 6e |version |permanen|
|00001e40| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|00001e50| 64 20 74 5d 20 35 29 0a | 28 64 65 66 76 61 72 20 |d t] 5).|(defvar |
|00001e60| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 66 6f 63 |ediff-re|gexp-foc|
|00001e70| 75 73 2d 41 20 22 22 20 | 22 5c 0a 52 65 67 65 78 |us-A "" |"\.Regex|
|00001e80| 70 20 74 68 61 74 20 64 | 65 74 65 72 6d 69 6e 65 |p that d|etermine|
|00001e90| 73 20 62 75 66 20 41 20 | 72 65 67 69 6f 6e 73 20 |s buf A |regions |
|00001ea0| 74 6f 20 66 6f 63 75 73 | 20 6f 6e 20 77 68 65 6e |to focus| on when|
|00001eb0| 20 73 6b 69 70 70 69 6e | 67 20 74 6f 20 64 69 66 | skippin|g to dif|
|00001ec0| 66 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |f.").(by|te-code |
|00001ed0| 22 c0 c1 21 88 c2 c1 c3 | c4 0d 5c 22 83 11 00 c6 |"..!....|..\"....|
|00001ee0| 82 12 00 c7 c8 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00001ef0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00001f00| 6f 63 61 6c 20 65 64 69 | 66 66 2d 72 65 67 65 78 |ocal edi|ff-regex|
|00001f10| 70 2d 66 6f 63 75 73 2d | 41 20 70 75 74 20 73 74 |p-focus-|A put st|
|00001f20| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|00001f30| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|00001f40| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00001f50| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 35 29 | preserv|ed t] 5)|
|00001f60| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 72 |.(defvar| ediff-r|
|00001f70| 65 67 65 78 70 2d 66 6f | 63 75 73 2d 42 20 22 22 |egexp-fo|cus-B ""|
|00001f80| 20 22 5c 0a 52 65 67 65 | 78 70 20 74 68 61 74 20 | "\.Rege|xp that |
|00001f90| 64 65 74 65 72 6d 69 6e | 65 73 20 62 75 66 20 42 |determin|es buf B|
|00001fa0| 20 72 65 67 69 6f 6e 73 | 20 74 6f 20 66 6f 63 75 | regions| to focu|
|00001fb0| 73 20 6f 6e 20 77 68 65 | 6e 20 73 6b 69 70 70 69 |s on whe|n skippi|
|00001fc0| 6e 67 20 74 6f 20 64 69 | 66 66 2e 22 29 0a 28 62 |ng to di|ff.").(b|
|00001fd0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00001fe0| c3 c4 0d 5c 22 83 11 00 | c6 82 12 00 c7 c8 23 87 |...\"...|......#.|
|00001ff0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00002000| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00002010| 69 66 66 2d 72 65 67 65 | 78 70 2d 66 6f 63 75 73 |iff-rege|xp-focus|
|00002020| 2d 42 20 70 75 74 20 73 | 74 72 69 6e 67 2d 6d 61 |-B put s|tring-ma|
|00002030| 74 63 68 20 22 4c 75 63 | 69 64 22 20 65 6d 61 63 |tch "Luc|id" emac|
|00002040| 73 2d 76 65 72 73 69 6f | 6e 20 70 65 72 6d 61 6e |s-versio|n perman|
|00002050| 65 6e 74 2d 6c 6f 63 61 | 6c 20 70 72 65 73 65 72 |ent-loca|l preser|
|00002060| 76 65 64 20 74 5d 20 35 | 29 0a 28 64 65 66 76 61 |ved t] 5|).(defva|
|00002070| 72 20 65 64 69 66 66 2d | 72 65 67 65 78 70 2d 68 |r ediff-|regexp-h|
|00002080| 69 64 65 2d 41 20 22 22 | 20 22 5c 0a 52 65 67 65 |ide-A ""| "\.Rege|
|00002090| 78 70 20 74 68 61 74 20 | 64 65 74 65 72 6d 69 6e |xp that |determin|
|000020a0| 65 73 20 62 75 66 20 41 | 20 72 65 67 69 6f 6e 73 |es buf A| regions|
|000020b0| 20 74 6f 20 69 67 6e 6f | 72 65 20 77 68 65 6e 20 | to igno|re when |
|000020c0| 73 6b 69 70 70 69 6e 67 | 20 74 6f 20 64 69 66 66 |skipping| to diff|
|000020d0| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|000020e0| c0 c1 21 88 c2 c1 c3 c4 | 0d 5c 22 83 11 00 c6 82 |..!.....|.\".....|
|000020f0| 12 00 c7 c8 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00002100| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00002110| 63 61 6c 20 65 64 69 66 | 66 2d 72 65 67 65 78 70 |cal edif|f-regexp|
|00002120| 2d 68 69 64 65 2d 41 20 | 70 75 74 20 73 74 72 69 |-hide-A |put stri|
|00002130| 6e 67 2d 6d 61 74 63 68 | 20 22 4c 75 63 69 64 22 |ng-match| "Lucid"|
|00002140| 20 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 20 70 | emacs-v|ersion p|
|00002150| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 70 |ermanent|-local p|
|00002160| 72 65 73 65 72 76 65 64 | 20 74 5d 20 35 29 0a 28 |reserved| t] 5).(|
|00002170| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 72 65 67 |defvar e|diff-reg|
|00002180| 65 78 70 2d 68 69 64 65 | 2d 42 20 22 22 20 22 5c |exp-hide|-B "" "\|
|00002190| 0a 52 65 67 65 78 70 20 | 74 68 61 74 20 64 65 74 |.Regexp |that det|
|000021a0| 65 72 6d 69 6e 65 73 20 | 62 75 66 20 42 20 72 65 |ermines |buf B re|
|000021b0| 67 69 6f 6e 73 20 74 6f | 20 69 67 6e 6f 72 65 20 |gions to| ignore |
|000021c0| 77 68 65 6e 20 73 6b 69 | 70 70 69 6e 67 20 74 6f |when ski|pping to|
|000021d0| 20 64 69 66 66 2e 22 29 | 0a 28 62 79 74 65 2d 63 | diff.")|.(byte-c|
|000021e0| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 0d 5c 22 |ode "..!|......\"|
|000021f0| 83 11 00 c6 82 12 00 c7 | c8 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00002200| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00002210| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 72 |er-local| ediff-r|
|00002220| 65 67 65 78 70 2d 68 69 | 64 65 2d 42 20 70 75 74 |egexp-hi|de-B put|
|00002230| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 4c | string-|match "L|
|00002240| 75 63 69 64 22 20 65 6d | 61 63 73 2d 76 65 72 73 |ucid" em|acs-vers|
|00002250| 69 6f 6e 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |ion perm|anent-lo|
|00002260| 63 61 6c 20 70 72 65 73 | 65 72 76 65 64 20 74 5d |cal pres|erved t]|
|00002270| 20 35 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 5).(def|var edif|
|00002280| 66 2d 70 61 74 63 68 2d | 70 72 6f 67 72 61 6d 20 |f-patch-|program |
|00002290| 22 70 61 74 63 68 22 20 | 22 5c 0a 2a 4e 61 6d 65 |"patch" |"\.*Name|
|000022a0| 20 6f 66 20 74 68 65 20 | 70 72 6f 67 72 61 6d 20 | of the |program |
|000022b0| 74 68 61 74 20 61 70 70 | 6c 69 65 73 20 70 61 74 |that app|lies pat|
|000022c0| 63 68 65 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ches.").|(defvar |
|000022d0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 6f 70 74 69 |ediff-pa|tch-opti|
|000022e0| 6f 6e 73 20 22 22 20 22 | 5c 0a 2a 4f 70 74 69 6f |ons "" "|\.*Optio|
|000022f0| 6e 73 20 74 6f 20 70 61 | 73 73 20 74 6f 20 65 64 |ns to pa|ss to ed|
|00002300| 69 66 66 2d 70 61 74 63 | 68 2d 70 72 6f 67 72 61 |iff-patc|h-progra|
|00002310| 6d 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |m.").(de|fvar edi|
|00002320| 66 66 2d 73 68 65 6c 6c | 20 28 62 79 74 65 2d 63 |ff-shell| (byte-c|
|00002330| 6f 64 65 20 22 08 c1 3d | 83 08 00 c2 87 c3 87 22 |ode "..=|......."|
|00002340| 20 5b 73 79 73 74 65 6d | 2d 74 79 70 65 20 65 6d | [system|-type em|
|00002350| 78 20 22 63 6d 64 22 20 | 22 73 68 22 5d 20 32 29 |x "cmd" |"sh"] 2)|
|00002360| 20 22 5c 0a 2a 54 68 65 | 20 73 68 65 6c 6c 20 75 | "\.*The| shell u|
|00002370| 73 65 64 20 74 6f 20 72 | 75 6e 20 64 69 66 66 20 |sed to r|un diff |
|00002380| 61 6e 64 20 70 61 74 63 | 68 2e 20 20 49 66 20 75 |and patc|h. If u|
|00002390| 73 65 72 27 73 20 2e 70 | 72 6f 66 69 6c 65 20 6f |ser's .p|rofile o|
|000023a0| 72 0a 2e 63 73 68 72 63 | 20 66 69 6c 65 73 20 61 |r..cshrc| files a|
|000023b0| 72 65 20 73 65 74 20 75 | 70 20 63 6f 72 72 65 63 |re set u|p correc|
|000023c0| 74 6c 79 2c 20 61 6e 79 | 20 73 68 65 6c 6c 20 77 |tly, any| shell w|
|000023d0| 69 6c 6c 20 64 6f 2e 20 | 20 48 6f 77 65 76 65 72 |ill do. | However|
|000023e0| 2c 20 73 6f 6d 65 20 70 | 65 6f 70 6c 65 0a 73 65 |, some p|eople.se|
|000023f0| 74 20 24 70 72 6f 6d 70 | 74 20 6f 72 20 6f 74 68 |t $promp|t or oth|
|00002400| 65 72 20 74 68 69 6e 67 | 73 20 69 6e 63 6f 72 72 |er thing|s incorr|
|00002410| 65 63 74 6c 79 2c 20 77 | 68 69 63 68 20 6c 65 61 |ectly, w|hich lea|
|00002420| 64 73 20 74 6f 20 75 6e | 64 65 73 69 72 61 62 6c |ds to un|desirabl|
|00002430| 65 20 6f 75 74 70 75 74 | 0a 6d 65 73 73 61 67 65 |e output|.message|
|00002440| 73 2e 20 20 54 68 65 73 | 65 20 6d 61 79 20 63 61 |s. Thes|e may ca|
|00002450| 75 73 65 20 45 64 69 66 | 66 20 74 6f 20 66 61 69 |use Edif|f to fai|
|00002460| 6c 2e 20 20 49 6e 20 73 | 75 63 68 20 61 20 63 61 |l. In s|uch a ca|
|00002470| 73 65 2c 20 73 65 74 20 | 65 64 69 66 66 2d 73 68 |se, set |ediff-sh|
|00002480| 65 6c 6c 0a 74 6f 20 61 | 20 73 68 65 6c 6c 20 74 |ell.to a| shell t|
|00002490| 68 61 74 20 79 6f 75 20 | 61 72 65 20 6e 6f 74 20 |hat you |are not |
|000024a0| 75 73 69 6e 67 20 6f 72 | 2c 20 62 65 74 74 65 72 |using or|, better|
|000024b0| 2c 20 66 69 78 20 79 6f | 75 72 20 73 68 65 6c 6c |, fix yo|ur shell|
|000024c0| 27 73 20 73 74 61 72 74 | 75 70 20 66 69 6c 65 2e |'s start|up file.|
|000024d0| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|000024e0| 2d 64 69 66 66 2d 6f 6b | 2d 6c 69 6e 65 73 2d 72 |-diff-ok|-lines-r|
|000024f0| 65 67 65 78 70 20 22 5e | 5c 5c 28 5b 30 2d 39 2c |egexp "^|\\([0-9,|
|00002500| 5d 2b 5b 61 63 64 5d 5b | 30 2d 39 2c 5d 2b 24 5c |]+[acd][|0-9,]+$\|
|00002510| 5c 7c 5b 3c 3e 5d 20 5c | 5c 7c 2d 2d 2d 5c 5c 7c |\|[<>] \|\|---\\||
|00002520| 57 61 72 6e 69 6e 67 3a | 5c 5c 29 22 20 22 5c 0a |Warning:|\\)" "\.|
|00002530| 2a 52 65 67 65 78 70 20 | 74 68 61 74 20 6d 61 74 |*Regexp |that mat|
|00002540| 63 68 65 73 20 6e 6f 72 | 6d 61 6c 20 6f 75 74 70 |ches nor|mal outp|
|00002550| 75 74 20 6c 69 6e 65 73 | 20 66 72 6f 6d 20 60 65 |ut lines| from `e|
|00002560| 64 69 66 66 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |diff-dif|f-progra|
|00002570| 6d 27 2e 0a 54 68 69 73 | 20 69 73 20 6d 6f 73 74 |m'..This| is most|
|00002580| 6c 79 20 6c 69 66 74 65 | 64 20 66 72 6f 6d 20 45 |ly lifte|d from E|
|00002590| 6d 65 72 67 65 2c 20 65 | 78 63 65 70 74 20 74 68 |merge, e|xcept th|
|000025a0| 61 74 20 45 64 69 66 66 | 20 61 6c 73 6f 20 63 6f |at Ediff| also co|
|000025b0| 6e 73 69 64 65 72 73 20 | 74 68 65 0a 27 4d 69 73 |nsiders |the.'Mis|
|000025c0| 73 69 6e 67 20 6e 65 77 | 6c 69 6e 65 27 20 6d 65 |sing new|line' me|
|000025d0| 73 73 61 67 65 20 74 6f | 20 62 65 20 27 6e 6f 72 |ssage to| be 'nor|
|000025e0| 6d 61 6c 20 6f 75 74 70 | 75 74 2e 27 0a 4c 69 6e |mal outp|ut.'.Lin|
|000025f0| 65 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 20 6d |es that |do not m|
|00002600| 61 74 63 68 20 61 72 65 | 20 61 73 73 75 6d 65 64 |atch are| assumed|
|00002610| 20 74 6f 20 62 65 20 65 | 72 72 6f 72 20 6d 65 73 | to be e|rror mes|
|00002620| 73 61 67 65 73 2e 22 29 | 0a 28 64 65 66 76 61 72 |sages.")|.(defvar|
|00002630| 20 65 64 69 66 66 2d 66 | 69 6e 65 2d 64 69 66 66 | ediff-f|ine-diff|
|00002640| 2d 6f 6b 2d 6c 69 6e 65 | 73 2d 72 65 67 65 78 70 |-ok-line|s-regexp|
|00002650| 20 22 5e 5c 5c 28 5b 30 | 2d 39 2c 5d 2b 5b 61 63 | "^\\([0|-9,]+[ac|
|00002660| 64 5d 5b 30 2d 39 2c 5d | 2b 24 5c 5c 7c 5b 3c 3e |d][0-9,]|+$\\|[<>|
|00002670| 5d 20 5c 5c 7c 2d 2d 2d | 5c 5c 7c 57 61 72 6e 69 |] \\|---|\\|Warni|
|00002680| 6e 67 3a 5c 5c 29 22 20 | 22 5c 0a 2a 52 65 67 65 |ng:\\)" |"\.*Rege|
|00002690| 78 70 20 74 68 61 74 20 | 6d 61 74 63 68 65 73 20 |xp that |matches |
|000026a0| 6e 6f 72 6d 61 6c 20 6f | 75 74 70 75 74 20 6c 69 |normal o|utput li|
|000026b0| 6e 65 73 20 66 72 6f 6d | 20 60 65 64 69 66 66 2d |nes from| `ediff-|
|000026c0| 66 69 6e 65 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |fine-dif|f-progra|
|000026d0| 6d 27 2e 0a 54 68 69 73 | 20 69 73 20 6d 6f 73 74 |m'..This| is most|
|000026e0| 6c 79 20 6c 69 66 74 65 | 64 20 66 72 6f 6d 20 45 |ly lifte|d from E|
|000026f0| 6d 65 72 67 65 2c 20 65 | 78 63 65 70 74 20 74 68 |merge, e|xcept th|
|00002700| 61 74 20 45 64 69 66 66 | 20 61 6c 73 6f 20 63 6f |at Ediff| also co|
|00002710| 6e 73 69 64 65 72 73 20 | 74 68 65 0a 27 4d 69 73 |nsiders |the.'Mis|
|00002720| 73 69 6e 67 20 6e 65 77 | 6c 69 6e 65 27 20 6d 65 |sing new|line' me|
|00002730| 73 73 61 67 65 20 74 6f | 20 62 65 20 27 6e 6f 72 |ssage to| be 'nor|
|00002740| 6d 61 6c 20 6f 75 74 70 | 75 74 2e 27 0a 4c 69 6e |mal outp|ut.'.Lin|
|00002750| 65 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 20 6d |es that |do not m|
|00002760| 61 74 63 68 20 61 72 65 | 20 61 73 73 75 6d 65 64 |atch are| assumed|
|00002770| 20 74 6f 20 62 65 20 65 | 72 72 6f 72 20 6d 65 73 | to be e|rror mes|
|00002780| 73 61 67 65 73 2e 22 29 | 0a 28 64 65 66 76 61 72 |sages.")|.(defvar|
|00002790| 20 65 64 69 66 66 2d 6d | 61 74 63 68 2d 64 69 66 | ediff-m|atch-dif|
|000027a0| 66 2d 6c 69 6e 65 20 28 | 62 79 74 65 2d 63 6f 64 |f-line (|byte-cod|
|000027b0| 65 20 22 c0 19 c2 09 c3 | 09 c4 b0 05 29 87 22 20 |e ".....|....)." |
|000027c0| 5b 22 5c 5c 28 5b 30 2d | 39 5d 2b 5c 5c 29 5c 5c |["\\([0-|9]+\\)\\|
|000027d0| 28 5c 5c 7c 2c 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |(\\|,\\(|[0-9]+\\|
|000027e0| 29 5c 5c 29 22 20 78 20 | 22 5e 22 20 22 5c 5c 28 |)\\)" x |"^" "\\(|
|000027f0| 5b 61 63 64 5d 5c 5c 29 | 22 20 22 24 22 5d 20 35 |[acd]\\)|" "$"] 5|
|00002800| 29 20 22 5c 0a 2a 50 61 | 74 74 65 72 6e 20 74 6f |) "\.*Pa|ttern to|
|00002810| 20 6d 61 74 63 68 20 6c | 69 6e 65 73 20 70 72 6f | match l|ines pro|
|00002820| 64 75 63 65 64 20 62 79 | 20 64 69 66 66 20 74 68 |duced by| diff th|
|00002830| 61 74 20 64 65 73 63 72 | 69 62 65 20 64 69 66 66 |at descr|ibe diff|
|00002840| 65 72 65 6e 63 65 73 2e | 22 29 0a 28 64 65 66 76 |erences.|").(defv|
|00002850| 61 72 20 65 64 69 66 66 | 2d 70 61 74 63 68 2d 62 |ar ediff|-patch-b|
|00002860| 75 66 20 6e 69 6c 20 22 | 5c 0a 54 68 65 20 62 75 |uf nil "|\.The bu|
|00002870| 66 66 65 72 20 6f 66 20 | 74 68 65 20 70 61 74 63 |ffer of |the patc|
|00002880| 68 20 66 69 6c 65 2e 22 | 29 0a 28 64 65 66 76 61 |h file."|).(defva|
|00002890| 72 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 64 69 |r ediff-|patch-di|
|000028a0| 61 67 6e 6f 73 74 69 63 | 73 20 6e 69 6c 20 22 5c |agnostic|s nil "\|
|000028b0| 0a 54 68 65 20 62 75 66 | 66 65 72 20 77 68 65 72 |.The buf|fer wher|
|000028c0| 65 20 70 61 74 63 68 20 | 77 6f 75 6c 64 20 64 69 |e patch |would di|
|000028d0| 73 70 6c 61 79 20 69 74 | 73 20 64 69 61 67 6e 6f |splay it|s diagno|
|000028e0| 73 74 69 63 73 2e 22 29 | 0a 28 64 65 66 76 61 72 |stics.")|.(defvar|
|000028f0| 20 65 64 69 66 66 2d 6b | 69 6c 6c 65 64 2d 64 69 | ediff-k|illed-di|
|00002900| 66 66 73 2d 61 6c 69 73 | 74 20 6e 69 6c 20 22 5c |ffs-alis|t nil "\|
|00002910| 0a 41 20 6c 69 73 74 20 | 6f 66 20 6b 69 6c 6c 65 |.A list |of kille|
|00002920| 64 20 64 69 66 66 73 2e | 20 0a 41 20 64 69 66 66 |d diffs.| .A diff|
|00002930| 20 69 73 20 73 61 76 65 | 64 20 68 65 72 65 20 69 | is save|d here i|
|00002940| 66 20 69 74 20 69 73 20 | 72 65 70 6c 61 63 65 64 |f it is |replaced|
|00002950| 20 62 79 20 61 20 64 69 | 66 66 0a 66 72 6f 6d 20 | by a di|ff.from |
|00002960| 61 6e 6f 74 68 65 72 20 | 62 75 66 66 65 72 2e 20 |another |buffer. |
|00002970| 20 54 68 69 73 20 61 6c | 69 73 74 20 68 61 73 20 | This al|ist has |
|00002980| 74 68 65 20 66 6f 72 6d | 3a 0a 28 28 6e 75 6d 20 |the form|:.((num |
|00002990| 28 41 20 2e 20 64 69 66 | 66 29 20 28 42 20 2e 20 |(A . dif|f) (B . |
|000029a0| 64 69 66 66 29 29 20 2e | 2e 2e 29 2c 0a 77 68 65 |diff)) .|..),.whe|
|000029b0| 72 65 20 41 20 6f 72 20 | 42 20 70 61 72 74 73 20 |re A or |B parts |
|000029c0| 6d 61 79 20 62 65 20 6d | 69 73 73 69 6e 67 2e 22 |may be m|issing."|
|000029d0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000029e0| 21 88 c2 c1 c3 c4 0d 5c | 22 83 11 00 c6 82 12 00 |!......\|".......|
|000029f0| c7 c8 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00002a00| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00002a10| 6c 20 65 64 69 66 66 2d | 6b 69 6c 6c 65 64 2d 64 |l ediff-|killed-d|
|00002a20| 69 66 66 73 2d 61 6c 69 | 73 74 20 70 75 74 20 73 |iffs-ali|st put s|
|00002a30| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 4c 75 63 |tring-ma|tch "Luc|
|00002a40| 69 64 22 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |id" emac|s-versio|
|00002a50| 6e 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |n perman|ent-loca|
|00002a60| 6c 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 35 |l preser|ved t] 5|
|00002a70| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00002a80| 62 65 66 6f 72 65 2d 66 | 6c 61 67 2d 62 6f 6c 20 |before-f|lag-bol |
|00002a90| 22 3e 3e 2d 2d 2d 3e 3e | 3e 5c 6e 22 20 22 5c 0a |">>--->>|>\n" "\.|
|00002aa0| 2a 46 6c 61 67 20 70 6c | 61 63 65 64 20 61 62 6f |*Flag pl|aced abo|
|00002ab0| 76 65 20 74 68 65 20 68 | 69 67 68 6c 69 67 68 74 |ve the h|ighlight|
|00002ac0| 65 64 20 62 6c 6f 63 6b | 20 6f 66 20 64 69 66 66 |ed block| of diff|
|00002ad0| 65 72 65 6e 63 65 73 2e | 20 0a 4d 75 73 74 20 65 |erences.| .Must e|
|00002ae0| 6e 64 20 77 69 74 68 20 | 6e 65 77 6c 69 6e 65 2e |nd with |newline.|
|00002af0| 20 20 4d 75 73 74 20 62 | 65 20 73 65 74 20 62 65 | Must b|e set be|
|00002b00| 66 6f 72 65 20 45 64 69 | 66 66 20 69 73 20 6c 6f |fore Edi|ff is lo|
|00002b10| 61 64 65 64 2e 22 29 0a | 28 64 65 66 76 61 72 20 |aded.").|(defvar |
|00002b20| 65 64 69 66 66 2d 61 66 | 74 65 72 2d 66 6c 61 67 |ediff-af|ter-flag|
|00002b30| 2d 62 6f 6c 20 22 3c 3c | 3c 2d 2d 2d 3c 3c 5c 6e |-bol "<<|<---<<\n|
|00002b40| 22 20 22 5c 0a 2a 46 6c | 61 67 20 70 6c 61 63 65 |" "\.*Fl|ag place|
|00002b50| 64 20 62 65 6c 6f 77 20 | 74 68 65 20 68 69 67 68 |d below |the high|
|00002b60| 6c 69 67 68 74 65 64 20 | 62 6c 6f 63 6b 20 6f 66 |lighted |block of|
|00002b70| 20 64 69 66 66 65 72 65 | 6e 63 65 73 2e 0a 4d 75 | differe|nces..Mu|
|00002b80| 73 74 20 65 6e 64 20 77 | 69 74 68 20 6e 65 77 6c |st end w|ith newl|
|00002b90| 69 6e 65 2e 20 20 4d 75 | 73 74 20 62 65 20 73 65 |ine. Mu|st be se|
|00002ba0| 74 20 62 65 66 6f 72 65 | 20 45 64 69 66 66 20 69 |t before| Ediff i|
|00002bb0| 73 20 6c 6f 61 64 65 64 | 2e 22 29 0a 28 64 65 66 |s loaded|.").(def|
|00002bc0| 76 61 72 20 65 64 69 66 | 66 2d 62 65 66 6f 72 65 |var edif|f-before|
|00002bd0| 2d 66 6c 61 67 2d 6d 6f | 6c 20 22 3e 3e 2d 2d 2d |-flag-mo|l ">>---|
|00002be0| 3e 3e 3e 22 20 22 5c 0a | 2a 4c 69 6b 65 20 65 64 |>>>" "\.|*Like ed|
|00002bf0| 69 66 66 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2c |iff-befo|re-flag,|
|00002c00| 20 75 73 65 64 20 77 68 | 65 6e 20 61 20 64 69 66 | used wh|en a dif|
|00002c10| 66 65 72 65 6e 63 65 20 | 73 74 61 72 74 73 20 69 |ference |starts i|
|00002c20| 6e 20 6d 69 64 2d 6c 69 | 6e 65 2e 22 29 0a 28 64 |n mid-li|ne.").(d|
|00002c30| 65 66 76 61 72 20 65 64 | 69 66 66 2d 61 66 74 65 |efvar ed|iff-afte|
|00002c40| 72 2d 66 6c 61 67 2d 6d | 6f 6c 20 22 3c 3c 3c 2d |r-flag-m|ol "<<<-|
|00002c50| 2d 2d 3c 3c 22 20 22 5c | 0a 2a 4c 69 6b 65 20 65 |--<<" "\|.*Like e|
|00002c60| 64 69 66 66 2d 61 66 74 | 65 72 2d 66 6c 61 67 2c |diff-aft|er-flag,|
|00002c70| 20 75 73 65 64 20 77 68 | 65 6e 20 61 20 64 69 66 | used wh|en a dif|
|00002c80| 66 65 72 65 6e 63 65 20 | 73 74 61 72 74 73 20 69 |ference |starts i|
|00002c90| 6e 20 6d 69 64 2d 6c 69 | 6e 65 2e 22 29 0a 28 64 |n mid-li|ne.").(d|
|00002ca0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 65 66 6f |efvar ed|iff-befo|
|00002cb0| 72 65 2d 66 6c 61 67 2d | 41 20 6e 69 6c 20 22 5c |re-flag-|A nil "\|
|00002cc0| 0a 54 68 69 73 20 69 73 | 20 74 68 65 20 61 63 74 |.This is| the act|
|00002cd0| 75 61 6c 20 41 53 43 49 | 49 20 62 65 66 6f 72 65 |ual ASCI|I before|
|00002ce0| 2d 66 6c 61 67 20 69 6e | 20 65 66 66 65 63 74 20 |-flag in| effect |
|00002cf0| 69 6e 20 62 75 66 66 65 | 72 20 41 2e 0a 49 74 20 |in buffe|r A..It |
|00002d00| 69 73 20 65 69 74 68 65 | 72 20 60 65 64 69 66 66 |is eithe|r `ediff|
|00002d10| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 2d 6d 6f 6c |-before-|flag-mol|
|00002d20| 27 20 6f 72 20 60 65 64 | 69 66 66 2d 62 65 66 6f |' or `ed|iff-befo|
|00002d30| 72 65 2d 66 6c 61 67 2d | 62 6f 6c 27 20 64 65 70 |re-flag-|bol' dep|
|00002d40| 65 6e 64 69 6e 67 0a 6f | 6e 20 77 68 65 74 68 65 |ending.o|n whethe|
|00002d50| 72 20 74 68 65 20 73 65 | 6c 65 63 74 65 64 20 64 |r the se|lected d|
|00002d60| 69 66 66 65 72 65 6e 63 | 65 20 72 65 67 69 6f 6e |ifferenc|e region|
|00002d70| 20 73 74 61 72 74 73 20 | 69 6e 20 74 68 65 20 6d | starts |in the m|
|00002d80| 69 64 64 6c 65 20 6f 66 | 20 61 20 6c 69 6e 65 20 |iddle of| a line |
|00002d90| 0a 6f 72 20 61 74 20 74 | 68 65 20 62 65 67 69 6e |.or at t|he begin|
|00002da0| 6e 69 6e 67 20 6f 66 20 | 61 20 6c 69 6e 65 2e 22 |ning of |a line."|
|00002db0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002dc0| 21 88 c2 c1 c3 c4 0d 5c | 22 83 11 00 c6 82 12 00 |!......\|".......|
|00002dd0| c7 c8 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00002de0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00002df0| 6c 20 65 64 69 66 66 2d | 62 65 66 6f 72 65 2d 66 |l ediff-|before-f|
|00002e00| 6c 61 67 2d 41 20 70 75 | 74 20 73 74 72 69 6e 67 |lag-A pu|t string|
|00002e10| 2d 6d 61 74 63 68 20 22 | 4c 75 63 69 64 22 20 65 |-match "|Lucid" e|
|00002e20| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 70 65 72 |macs-ver|sion per|
|00002e30| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00002e40| 73 65 72 76 65 64 20 74 | 5d 20 35 29 0a 28 64 65 |served t|] 5).(de|
|00002e50| 66 76 61 72 20 65 64 69 | 66 66 2d 61 66 74 65 72 |fvar edi|ff-after|
|00002e60| 2d 66 6c 61 67 2d 41 20 | 6e 69 6c 20 22 5c 0a 54 |-flag-A |nil "\.T|
|00002e70| 68 69 73 20 69 73 20 74 | 68 65 20 61 63 74 75 61 |his is t|he actua|
|00002e80| 6c 20 41 53 43 49 49 20 | 61 66 74 65 72 2d 66 6c |l ASCII |after-fl|
|00002e90| 61 67 20 69 6e 20 65 66 | 66 65 63 74 20 69 6e 20 |ag in ef|fect in |
|00002ea0| 62 75 66 66 65 72 20 41 | 2e 0a 49 74 20 69 73 20 |buffer A|..It is |
|00002eb0| 65 69 74 68 65 72 20 60 | 65 64 69 66 66 2d 62 65 |either `|ediff-be|
|00002ec0| 66 6f 72 65 2d 66 6c 61 | 67 2d 6d 6f 6c 27 20 6f |fore-fla|g-mol' o|
|00002ed0| 72 20 60 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |r `ediff|-before-|
|00002ee0| 66 6c 61 67 2d 62 6f 6c | 27 20 64 65 70 65 6e 64 |flag-bol|' depend|
|00002ef0| 69 6e 67 0a 6f 6e 20 77 | 68 65 74 68 65 72 20 74 |ing.on w|hether t|
|00002f00| 68 65 20 73 65 6c 65 63 | 74 65 64 20 64 69 66 66 |he selec|ted diff|
|00002f10| 65 72 65 6e 63 65 20 72 | 65 67 69 6f 6e 20 73 74 |erence r|egion st|
|00002f20| 61 72 74 73 20 69 6e 20 | 74 68 65 20 6d 69 64 64 |arts in |the midd|
|00002f30| 6c 65 20 6f 66 20 61 20 | 6c 69 6e 65 20 0a 6f 72 |le of a |line .or|
|00002f40| 20 61 74 20 74 68 65 20 | 62 65 67 69 6e 6e 69 6e | at the |beginnin|
|00002f50| 67 20 6f 66 20 61 20 6c | 69 6e 65 2e 22 29 0a 28 |g of a l|ine.").(|
|00002f60| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002f70| c1 c3 c4 0d 5c 22 83 11 | 00 c6 82 12 00 c7 c8 23 |....\"..|.......#|
|00002f80| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00002f90| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00002fa0| 64 69 66 66 2d 61 66 74 | 65 72 2d 66 6c 61 67 2d |diff-aft|er-flag-|
|00002fb0| 41 20 70 75 74 20 73 74 | 72 69 6e 67 2d 6d 61 74 |A put st|ring-mat|
|00002fc0| 63 68 20 22 4c 75 63 69 | 64 22 20 65 6d 61 63 73 |ch "Luci|d" emacs|
|00002fd0| 2d 76 65 72 73 69 6f 6e | 20 70 65 72 6d 61 6e 65 |-version| permane|
|00002fe0| 6e 74 2d 6c 6f 63 61 6c | 20 70 72 65 73 65 72 76 |nt-local| preserv|
|00002ff0| 65 64 20 74 5d 20 35 29 | 0a 28 64 65 66 76 61 72 |ed t] 5)|.(defvar|
|00003000| 20 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c | ediff-b|efore-fl|
|00003010| 61 67 2d 42 20 6e 69 6c | 20 22 5c 0a 54 68 69 73 |ag-B nil| "\.This|
|00003020| 20 69 73 20 74 68 65 20 | 61 63 74 75 61 6c 20 41 | is the |actual A|
|00003030| 53 43 49 49 20 62 65 66 | 6f 72 65 2d 66 6c 61 67 |SCII bef|ore-flag|
|00003040| 20 69 6e 20 65 66 66 65 | 63 74 20 69 6e 20 62 75 | in effe|ct in bu|
|00003050| 66 66 65 72 20 42 2e 0a | 49 74 20 69 73 20 65 69 |ffer B..|It is ei|
|00003060| 74 68 65 72 20 60 65 64 | 69 66 66 2d 62 65 66 6f |ther `ed|iff-befo|
|00003070| 72 65 2d 66 6c 61 67 2d | 6d 6f 6c 27 20 6f 72 20 |re-flag-|mol' or |
|00003080| 60 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c |`ediff-b|efore-fl|
|00003090| 61 67 2d 62 6f 6c 27 20 | 64 65 70 65 6e 64 69 6e |ag-bol' |dependin|
|000030a0| 67 0a 6f 6e 20 77 68 65 | 74 68 65 72 20 74 68 65 |g.on whe|ther the|
|000030b0| 20 73 65 6c 65 63 74 65 | 64 20 64 69 66 66 65 72 | selecte|d differ|
|000030c0| 65 6e 63 65 20 72 65 67 | 69 6f 6e 20 73 74 61 72 |ence reg|ion star|
|000030d0| 74 73 20 69 6e 20 74 68 | 65 20 6d 69 64 64 6c 65 |ts in th|e middle|
|000030e0| 20 6f 66 20 61 20 6c 69 | 6e 65 20 0a 6f 72 20 61 | of a li|ne .or a|
|000030f0| 74 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |t the be|ginning |
|00003100| 6f 66 20 61 20 6c 69 6e | 65 2e 22 29 0a 28 62 79 |of a lin|e.").(by|
|00003110| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00003120| c4 0d 5c 22 83 11 00 c6 | 82 12 00 c7 c8 23 87 22 |..\"....|.....#."|
|00003130| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00003140| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|00003150| 66 66 2d 62 65 66 6f 72 | 65 2d 66 6c 61 67 2d 42 |ff-befor|e-flag-B|
|00003160| 20 70 75 74 20 73 74 72 | 69 6e 67 2d 6d 61 74 63 | put str|ing-matc|
|00003170| 68 20 22 4c 75 63 69 64 | 22 20 65 6d 61 63 73 2d |h "Lucid|" emacs-|
|00003180| 76 65 72 73 69 6f 6e 20 | 70 65 72 6d 61 6e 65 6e |version |permanen|
|00003190| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|000031a0| 64 20 74 5d 20 35 29 0a | 28 64 65 66 76 61 72 20 |d t] 5).|(defvar |
|000031b0| 65 64 69 66 66 2d 61 66 | 74 65 72 2d 66 6c 61 67 |ediff-af|ter-flag|
|000031c0| 2d 42 20 6e 69 6c 20 22 | 5c 0a 54 68 69 73 20 69 |-B nil "|\.This i|
|000031d0| 73 20 74 68 65 20 61 63 | 74 75 61 6c 20 41 53 43 |s the ac|tual ASC|
|000031e0| 49 49 20 61 66 74 65 72 | 2d 66 6c 61 67 20 69 6e |II after|-flag in|
|000031f0| 20 65 66 66 65 63 74 20 | 69 6e 20 62 75 66 66 65 | effect |in buffe|
|00003200| 72 20 42 2e 0a 49 74 20 | 69 73 20 65 69 74 68 65 |r B..It |is eithe|
|00003210| 72 20 60 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |r `ediff|-before-|
|00003220| 66 6c 61 67 2d 6d 6f 6c | 27 20 6f 72 20 60 65 64 |flag-mol|' or `ed|
|00003230| 69 66 66 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2d |iff-befo|re-flag-|
|00003240| 62 6f 6c 27 20 64 65 70 | 65 6e 64 69 6e 67 0a 6f |bol' dep|ending.o|
|00003250| 6e 20 77 68 65 74 68 65 | 72 20 74 68 65 20 73 65 |n whethe|r the se|
|00003260| 6c 65 63 74 65 64 20 64 | 69 66 66 65 72 65 6e 63 |lected d|ifferenc|
|00003270| 65 20 72 65 67 69 6f 6e | 20 73 74 61 72 74 73 20 |e region| starts |
|00003280| 69 6e 20 74 68 65 20 6d | 69 64 64 6c 65 20 6f 66 |in the m|iddle of|
|00003290| 20 61 20 6c 69 6e 65 20 | 0a 6f 72 20 61 74 20 74 | a line |.or at t|
|000032a0| 68 65 20 62 65 67 69 6e | 6e 69 6e 67 20 6f 66 20 |he begin|ning of |
|000032b0| 61 20 6c 69 6e 65 2e 22 | 29 0a 28 62 79 74 65 2d |a line."|).(byte-|
|000032c0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 0d 5c |code "..|!......\|
|000032d0| 22 83 11 00 c6 82 12 00 | c7 c8 23 87 22 20 5b 6d |".......|..#." [m|
|000032e0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000032f0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00003300| 61 66 74 65 72 2d 66 6c | 61 67 2d 42 20 70 75 74 |after-fl|ag-B put|
|00003310| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 4c | string-|match "L|
|00003320| 75 63 69 64 22 20 65 6d | 61 63 73 2d 76 65 72 73 |ucid" em|acs-vers|
|00003330| 69 6f 6e 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |ion perm|anent-lo|
|00003340| 63 61 6c 20 70 72 65 73 | 65 72 76 65 64 20 74 5d |cal pres|erved t]|
|00003350| 20 35 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 5).(def|var edif|
|00003360| 66 2d 77 61 6e 74 2d 66 | 61 63 65 73 20 74 20 22 |f-want-f|aces t "|
|00003370| 5c 0a 49 66 20 74 2c 20 | 64 69 66 66 65 72 65 6e |\.If t, |differen|
|00003380| 63 65 73 20 61 72 65 20 | 68 69 67 68 6c 69 67 68 |ces are |highligh|
|00003390| 74 65 64 20 75 73 69 6e | 67 20 66 61 63 65 73 20 |ted usin|g faces |
|000033a0| 6f 6e 20 61 20 77 69 6e | 64 6f 77 20 73 79 73 74 |on a win|dow syst|
|000033b0| 65 6d 2e 0a 49 66 20 6e | 69 6c 2c 20 74 68 65 79 |em..If n|il, they|
|000033c0| 20 61 72 65 20 68 69 67 | 68 6c 69 67 68 74 65 64 | are hig|hlighted|
|000033d0| 20 75 73 69 6e 67 20 41 | 53 43 49 49 20 66 6c 61 | using A|SCII fla|
|000033e0| 67 73 2c 20 65 64 69 66 | 66 2d 62 65 66 6f 72 65 |gs, edif|f-before|
|000033f0| 2d 66 6c 61 67 0a 61 6e | 64 20 65 64 69 66 66 2d |-flag.an|d ediff-|
|00003400| 61 66 74 65 72 2d 66 6c | 61 67 2e 20 20 4f 6e 20 |after-fl|ag. On |
|00003410| 61 20 6e 6f 6e 2d 77 69 | 6e 64 6f 77 20 73 79 73 |a non-wi|ndow sys|
|00003420| 74 65 6d 2c 20 64 69 66 | 66 65 72 65 6e 63 65 73 |tem, dif|ferences|
|00003430| 20 61 72 65 20 61 6c 77 | 61 79 73 0a 68 69 67 68 | are alw|ays.high|
|00003440| 6c 69 67 68 74 65 64 20 | 75 73 69 6e 67 20 41 53 |lighted |using AS|
|00003450| 43 49 49 20 66 6c 61 67 | 73 2e 0a 0a 54 68 69 73 |CII flag|s...This|
|00003460| 20 76 61 72 69 61 62 6c | 65 20 63 61 6e 20 62 65 | variabl|e can be|
|00003470| 20 73 65 74 20 65 69 74 | 68 65 72 20 69 6e 20 2e | set eit|her in .|
|00003480| 65 6d 61 63 73 20 6f 72 | 20 74 6f 67 67 6c 65 64 |emacs or| toggled|
|00003490| 20 69 6e 74 65 72 61 63 | 74 69 76 65 6c 79 2c 20 | interac|tively, |
|000034a0| 75 73 69 6e 67 0a 65 64 | 69 66 66 2d 74 6f 67 67 |using.ed|iff-togg|
|000034b0| 6c 65 2d 68 69 6c 69 74 | 2e 22 29 0a 28 62 79 74 |le-hilit|.").(byt|
|000034c0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000034d0| 0d 5c 22 83 11 00 c6 82 | 12 00 c7 c8 23 87 22 20 |.\".....|....#." |
|000034e0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000034f0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00003500| 66 2d 77 61 6e 74 2d 66 | 61 63 65 73 20 70 75 74 |f-want-f|aces put|
|00003510| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 4c | string-|match "L|
|00003520| 75 63 69 64 22 20 65 6d | 61 63 73 2d 76 65 72 73 |ucid" em|acs-vers|
|00003530| 69 6f 6e 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |ion perm|anent-lo|
|00003540| 63 61 6c 20 70 72 65 73 | 65 72 76 65 64 20 74 5d |cal pres|erved t]|
|00003550| 20 35 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 5).(def|var edif|
|00003560| 66 2d 77 61 6e 74 2d 64 | 65 66 61 75 6c 74 2d 6d |f-want-d|efault-m|
|00003570| 65 6e 75 73 20 74 20 22 | 5c 0a 49 66 20 74 2c 20 |enus t "|\.If t, |
|00003580| 45 64 69 66 66 20 77 69 | 6c 6c 20 73 65 74 20 75 |Ediff wi|ll set u|
|00003590| 70 20 6d 65 6e 75 73 20 | 69 6e 20 74 68 65 20 6d |p menus |in the m|
|000035a0| 65 6e 75 20 62 61 72 2e | 0a 54 68 69 73 20 76 61 |enu bar.|.This va|
|000035b0| 72 69 61 62 6c 65 20 6d | 75 73 74 20 62 65 20 73 |riable m|ust be s|
|000035c0| 65 74 20 62 65 66 6f 72 | 65 20 45 64 69 66 66 20 |et befor|e Ediff |
|000035d0| 69 73 20 6c 6f 61 64 65 | 64 2e 20 49 66 20 79 6f |is loade|d. If yo|
|000035e0| 75 20 64 6f 6e 27 74 20 | 6c 69 6b 65 20 74 68 65 |u don't |like the|
|000035f0| 0a 6c 6f 6f 6b 20 6f 66 | 20 74 68 65 20 64 65 66 |.look of| the def|
|00003600| 61 75 6c 74 20 6d 65 6e | 75 73 2c 20 73 65 74 20 |ault men|us, set |
|00003610| 74 68 69 73 20 76 61 72 | 69 61 62 6c 65 20 74 6f |this var|iable to|
|00003620| 20 6e 69 6c 20 61 6e 64 | 20 6d 61 6b 65 20 79 6f | nil and| make yo|
|00003630| 75 72 20 6f 77 6e 0a 6d | 65 6e 75 73 2e 22 29 0a |ur own.m|enus.").|
|00003640| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00003650| c2 c1 c3 c4 0d 5c 22 83 | 11 00 c6 82 12 00 c7 c8 |.....\".|........|
|00003660| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003670| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003680| 65 64 69 66 66 2d 77 61 | 6e 74 2d 64 65 66 61 75 |ediff-wa|nt-defau|
|00003690| 6c 74 2d 6d 65 6e 75 73 | 20 70 75 74 20 73 74 72 |lt-menus| put str|
|000036a0| 69 6e 67 2d 6d 61 74 63 | 68 20 22 4c 75 63 69 64 |ing-matc|h "Lucid|
|000036b0| 22 20 65 6d 61 63 73 2d | 76 65 72 73 69 6f 6e 20 |" emacs-|version |
|000036c0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000036d0| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 35 29 0a |preserve|d t] 5).|
|000036e0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 61 75 |(defvar |ediff-au|
|000036f0| 74 6f 2d 72 65 66 69 6e | 65 20 28 62 79 74 65 2d |to-refin|e (byte-|
|00003700| 63 6f 64 65 20 22 08 83 | 06 00 c1 87 c2 87 22 20 |code "..|......" |
|00003710| 5b 77 69 6e 64 6f 77 2d | 73 79 73 74 65 6d 20 6f |[window-|system o|
|00003720| 6e 20 6e 69 78 5d 20 31 | 29 20 22 5c 0a 49 66 20 |n nix] 1|) "\.If |
|00003730| 60 27 6f 6e 27 2c 20 45 | 64 69 66 66 20 61 75 74 |`'on', E|diff aut|
|00003740| 6f 2d 68 69 67 68 6c 69 | 67 68 74 73 20 66 69 6e |o-highli|ghts fin|
|00003750| 65 20 64 69 66 66 73 20 | 66 6f 72 20 74 68 65 20 |e diffs |for the |
|00003760| 63 75 72 72 65 6e 74 20 | 64 69 66 66 20 72 65 67 |current |diff reg|
|00003770| 69 6f 6e 2e 0a 49 66 20 | 60 6f 66 66 27 2c 20 61 |ion..If |`off', a|
|00003780| 75 74 6f 2d 68 69 67 68 | 6c 69 67 68 74 69 6e 67 |uto-high|lighting|
|00003790| 20 69 73 20 6e 6f 74 20 | 75 73 65 64 2e 20 49 66 | is not |used. If|
|000037a0| 20 60 27 6e 69 78 27 2c | 20 6e 6f 20 66 69 6e 65 | `'nix',| no fine|
|000037b0| 20 64 69 66 66 73 20 61 | 72 65 20 73 68 6f 77 6e | diffs a|re shown|
|000037c0| 0a 61 74 20 61 6c 6c 2c | 20 75 6e 6c 65 73 73 20 |.at all,| unless |
|000037d0| 74 68 65 20 75 73 65 72 | 20 66 6f 72 63 65 2d 72 |the user| force-r|
|000037e0| 65 66 69 6e 65 73 20 74 | 68 65 20 72 65 67 69 6f |efines t|he regio|
|000037f0| 6e 20 62 79 20 68 69 74 | 74 69 6e 67 20 60 2a 27 |n by hit|ting `*'|
|00003800| 2e 0a 0a 54 68 69 73 20 | 76 61 72 69 61 62 6c 65 |...This |variable|
|00003810| 20 63 61 6e 20 62 65 20 | 73 65 74 20 65 69 74 68 | can be |set eith|
|00003820| 65 72 20 69 6e 20 2e 65 | 6d 61 63 73 20 6f 72 20 |er in .e|macs or |
|00003830| 74 6f 67 67 6c 65 64 20 | 69 6e 74 65 72 61 63 74 |toggled |interact|
|00003840| 69 76 65 6c 79 2c 20 75 | 73 69 6e 67 0a 65 64 69 |ively, u|sing.edi|
|00003850| 66 66 2d 74 6f 67 67 6c | 65 2d 68 69 6c 69 74 2e |ff-toggl|e-hilit.|
|00003860| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00003870| c1 21 88 c2 c1 c3 c4 0d | 5c 22 83 11 00 c6 82 12 |.!......|\"......|
|00003880| 00 c7 c8 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003890| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000038a0| 61 6c 20 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |al ediff|-auto-re|
|000038b0| 66 69 6e 65 20 70 75 74 | 20 73 74 72 69 6e 67 2d |fine put| string-|
|000038c0| 6d 61 74 63 68 20 22 4c | 75 63 69 64 22 20 65 6d |match "L|ucid" em|
|000038d0| 61 63 73 2d 76 65 72 73 | 69 6f 6e 20 70 65 72 6d |acs-vers|ion perm|
|000038e0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 70 72 65 73 |anent-lo|cal pres|
|000038f0| 65 72 76 65 64 20 74 5d | 20 35 29 0a 28 64 65 66 |erved t]| 5).(def|
|00003900| 76 61 72 20 65 64 69 66 | 66 2d 69 67 6e 6f 72 65 |var edif|f-ignore|
|00003910| 2d 73 69 6d 69 6c 61 72 | 2d 72 65 67 69 6f 6e 73 |-similar|-regions|
|00003920| 20 6e 69 6c 20 22 5c 0a | 2a 49 66 20 74 2c 20 73 | nil "\.|*If t, s|
|00003930| 6b 69 70 20 6f 76 65 72 | 20 64 69 66 66 65 72 65 |kip over| differe|
|00003940| 6e 63 65 20 72 65 67 69 | 6f 6e 73 20 74 68 61 74 |nce regi|ons that|
|00003950| 20 64 69 66 66 65 72 20 | 6f 6e 6c 79 20 69 6e 20 | differ |only in |
|00003960| 74 68 65 20 77 68 69 74 | 65 20 73 70 61 63 65 20 |the whit|e space |
|00003970| 61 6e 64 20 6c 69 6e 65 | 20 62 72 65 61 6b 73 2e |and line| breaks.|
|00003980| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00003990| c1 21 88 c2 c1 c3 c4 0d | 5c 22 83 11 00 c6 82 12 |.!......|\"......|
|000039a0| 00 c7 c8 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|000039b0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000039c0| 61 6c 20 65 64 69 66 66 | 2d 69 67 6e 6f 72 65 2d |al ediff|-ignore-|
|000039d0| 73 69 6d 69 6c 61 72 2d | 72 65 67 69 6f 6e 73 20 |similar-|regions |
|000039e0| 70 75 74 20 73 74 72 69 | 6e 67 2d 6d 61 74 63 68 |put stri|ng-match|
|000039f0| 20 22 4c 75 63 69 64 22 | 20 65 6d 61 63 73 2d 76 | "Lucid"| emacs-v|
|00003a00| 65 72 73 69 6f 6e 20 70 | 65 72 6d 61 6e 65 6e 74 |ersion p|ermanent|
|00003a10| 2d 6c 6f 63 61 6c 20 70 | 72 65 73 65 72 76 65 64 |-local p|reserved|
|00003a20| 20 74 5d 20 35 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 5).(|defvar e|
|00003a30| 64 69 66 66 2d 61 75 74 | 6f 2d 72 65 66 69 6e 65 |diff-aut|o-refine|
|00003a40| 2d 6c 69 6d 69 74 20 37 | 30 30 20 22 5c 0a 41 75 |-limit 7|00 "\.Au|
|00003a50| 74 6f 2d 72 65 66 69 6e | 65 20 6f 6e 6c 79 20 74 |to-refin|e only t|
|00003a60| 68 6f 73 65 20 72 65 67 | 69 6f 6e 73 20 74 68 61 |hose reg|ions tha|
|00003a70| 74 20 61 72 65 20 73 6d | 61 6c 6c 65 72 20 74 68 |t are sm|aller th|
|00003a80| 61 6e 20 74 68 69 73 20 | 6e 75 6d 62 65 72 20 6f |an this |number o|
|00003a90| 66 20 62 79 74 65 73 2e | 22 29 0a 28 62 79 74 65 |f bytes.|").(byte|
|00003aa0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 0d |-code ".|.!......|
|00003ab0| 5c 22 83 11 00 c6 82 12 | 00 c7 c8 23 87 22 20 5b |\"......|...#." [|
|00003ac0| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00003ad0| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00003ae0| 2d 61 75 74 6f 2d 72 65 | 66 69 6e 65 2d 6c 69 6d |-auto-re|fine-lim|
|00003af0| 69 74 20 70 75 74 20 73 | 74 72 69 6e 67 2d 6d 61 |it put s|tring-ma|
|00003b00| 74 63 68 20 22 4c 75 63 | 69 64 22 20 65 6d 61 63 |tch "Luc|id" emac|
|00003b10| 73 2d 76 65 72 73 69 6f | 6e 20 70 65 72 6d 61 6e |s-versio|n perman|
|00003b20| 65 6e 74 2d 6c 6f 63 61 | 6c 20 70 72 65 73 65 72 |ent-loca|l preser|
|00003b30| 76 65 64 20 74 5d 20 35 | 29 0a 28 64 65 66 76 61 |ved t] 5|).(defva|
|00003b40| 72 20 65 64 69 66 66 2d | 68 69 67 68 6c 69 67 68 |r ediff-|highligh|
|00003b50| 74 2d 61 6c 6c 2d 64 69 | 66 66 73 20 74 20 22 5c |t-all-di|ffs t "\|
|00003b60| 0a 49 66 20 6e 69 6c 2c | 20 6f 6e 6c 79 20 74 68 |.If nil,| only th|
|00003b70| 65 20 73 65 6c 65 63 74 | 65 64 20 64 69 66 66 65 |e select|ed diffe|
|00003b80| 72 65 6e 63 65 73 20 61 | 72 65 20 68 69 67 68 6c |rences a|re highl|
|00003b90| 69 67 68 74 65 64 2e 0a | 54 68 69 73 20 76 61 72 |ighted..|This var|
|00003ba0| 69 61 62 6c 65 20 63 61 | 6e 20 62 65 20 73 65 74 |iable ca|n be set|
|00003bb0| 20 65 69 74 68 65 72 20 | 69 6e 20 2e 65 6d 61 63 | either |in .emac|
|00003bc0| 73 20 6f 72 20 74 6f 67 | 67 6c 65 64 20 69 6e 74 |s or tog|gled int|
|00003bd0| 65 72 61 63 74 69 76 65 | 6c 79 2c 20 75 73 69 6e |eractive|ly, usin|
|00003be0| 67 0a 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 68 |g.ediff-|toggle-h|
|00003bf0| 69 6c 69 74 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |ilit.").|(byte-co|
|00003c00| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 0d 5c 22 83 |de "..!.|.....\".|
|00003c10| 11 00 c6 82 12 00 c7 c8 | 23 87 22 20 5b 6d 61 6b |........|#." [mak|
|00003c20| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00003c30| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 68 69 |r-local |ediff-hi|
|00003c40| 67 68 6c 69 67 68 74 2d | 61 6c 6c 2d 64 69 66 66 |ghlight-|all-diff|
|00003c50| 73 20 70 75 74 20 73 74 | 72 69 6e 67 2d 6d 61 74 |s put st|ring-mat|
|00003c60| 63 68 20 22 4c 75 63 69 | 64 22 20 65 6d 61 63 73 |ch "Luci|d" emacs|
|00003c70| 2d 76 65 72 73 69 6f 6e | 20 70 65 72 6d 61 6e 65 |-version| permane|
|00003c80| 6e 74 2d 6c 6f 63 61 6c | 20 70 72 65 73 65 72 76 |nt-local| preserv|
|00003c90| 65 64 20 74 5d 20 35 29 | 0a 28 64 65 66 76 61 72 |ed t] 5)|.(defvar|
|00003ca0| 20 65 64 69 66 66 2d 68 | 69 67 68 6c 69 67 68 74 | ediff-h|ighlight|
|00003cb0| 69 6e 67 2d 73 74 79 6c | 65 20 6e 69 6c 20 22 5c |ing-styl|e nil "\|
|00003cc0| 0a 41 20 76 61 72 20 6c | 6f 63 61 6c 20 74 6f 20 |.A var l|ocal to |
|00003cd0| 65 61 63 68 20 63 6f 6e | 74 72 6f 6c 20 70 61 6e |each con|trol pan|
|00003ce0| 65 6c 20 62 75 66 66 65 | 72 2e 0a 49 6e 64 69 63 |el buffe|r..Indic|
|00003cf0| 61 74 65 73 20 68 69 67 | 68 6c 69 67 68 74 69 6e |ates hig|hlightin|
|00003d00| 67 20 73 74 79 6c 65 20 | 69 6e 20 65 66 66 65 63 |g style |in effec|
|00003d10| 74 20 66 6f 72 20 74 68 | 69 73 20 62 75 66 66 65 |t for th|is buffe|
|00003d20| 72 3a 20 60 66 61 63 65 | 27 2c 20 60 61 73 63 69 |r: `face|', `asci|
|00003d30| 69 27 2c 0a 6e 69 6c 20 | 2d 2d 20 74 65 6d 70 6f |i',.nil |-- tempo|
|00003d40| 72 61 72 69 6c 79 20 75 | 6e 68 69 67 68 6c 69 67 |rarily u|nhighlig|
|00003d50| 68 74 65 64 2c 20 60 6f | 66 66 27 20 2d 2d 20 74 |hted, `o|ff' -- t|
|00003d60| 75 72 6e 65 64 20 6f 66 | 66 20 28 6f 6e 20 61 20 |urned of|f (on a |
|00003d70| 64 75 6d 62 0a 74 65 72 | 6d 69 6e 61 6c 20 6f 6e |dumb.ter|minal on|
|00003d80| 6c 79 29 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ly).").(|byte-cod|
|00003d90| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 0d 5c 22 83 11 |e "..!..|....\"..|
|00003da0| 00 c6 82 12 00 c7 c8 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00003db0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00003dc0| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 68 69 67 |-local e|diff-hig|
|00003dd0| 68 6c 69 67 68 74 69 6e | 67 2d 73 74 79 6c 65 20 |hlightin|g-style |
|00003de0| 70 75 74 20 73 74 72 69 | 6e 67 2d 6d 61 74 63 68 |put stri|ng-match|
|00003df0| 20 22 4c 75 63 69 64 22 | 20 65 6d 61 63 73 2d 76 | "Lucid"| emacs-v|
|00003e00| 65 72 73 69 6f 6e 20 70 | 65 72 6d 61 6e 65 6e 74 |ersion p|ermanent|
|00003e10| 2d 6c 6f 63 61 6c 20 70 | 72 65 73 65 72 76 65 64 |-local p|reserved|
|00003e20| 20 74 5d 20 35 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 5).(|defvar e|
|00003e30| 64 69 66 66 2d 41 2d 62 | 75 66 66 65 72 20 6e 69 |diff-A-b|uffer ni|
|00003e40| 6c 20 22 5c 0a 54 68 65 | 20 62 75 66 66 65 72 20 |l "\.The| buffer |
|00003e50| 69 6e 20 77 68 69 63 68 | 20 74 68 65 20 41 20 76 |in which| the A v|
|00003e60| 61 72 69 61 6e 74 20 69 | 73 20 73 74 6f 72 65 64 |ariant i|s stored|
|00003e70| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00003e80| c0 c1 21 88 c2 c1 c3 c4 | 0d 5c 22 83 11 00 c6 82 |..!.....|.\".....|
|00003e90| 12 00 c7 c8 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00003ea0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00003eb0| 63 61 6c 20 65 64 69 66 | 66 2d 41 2d 62 75 66 66 |cal edif|f-A-buff|
|00003ec0| 65 72 20 70 75 74 20 73 | 74 72 69 6e 67 2d 6d 61 |er put s|tring-ma|
|00003ed0| 74 63 68 20 22 4c 75 63 | 69 64 22 20 65 6d 61 63 |tch "Luc|id" emac|
|00003ee0| 73 2d 76 65 72 73 69 6f | 6e 20 70 65 72 6d 61 6e |s-versio|n perman|
|00003ef0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 70 72 65 73 65 72 |ent-loca|l preser|
|00003f00| 76 65 64 20 74 5d 20 35 | 29 0a 28 64 65 66 76 61 |ved t] 5|).(defva|
|00003f10| 72 20 65 64 69 66 66 2d | 42 2d 62 75 66 66 65 72 |r ediff-|B-buffer|
|00003f20| 20 6e 69 6c 20 22 5c 0a | 54 68 65 20 62 75 66 66 | nil "\.|The buff|
|00003f30| 65 72 20 69 6e 20 77 68 | 69 63 68 20 74 68 65 20 |er in wh|ich the |
|00003f40| 42 20 76 61 72 69 61 6e | 74 20 69 73 20 73 74 6f |B varian|t is sto|
|00003f50| 72 65 64 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |red.").(|byte-cod|
|00003f60| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 0d 5c 22 83 11 |e "..!..|....\"..|
|00003f70| 00 c6 82 12 00 c7 c8 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00003f80| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00003f90| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 42 2d 62 |-local e|diff-B-b|
|00003fa0| 75 66 66 65 72 20 70 75 | 74 20 73 74 72 69 6e 67 |uffer pu|t string|
|00003fb0| 2d 6d 61 74 63 68 20 22 | 4c 75 63 69 64 22 20 65 |-match "|Lucid" e|
|00003fc0| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 70 65 72 |macs-ver|sion per|
|00003fd0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00003fe0| 73 65 72 76 65 64 20 74 | 5d 20 35 29 0a 28 64 65 |served t|] 5).(de|
|00003ff0| 66 76 61 72 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |fvar edi|ff-contr|
|00004000| 6f 6c 2d 62 75 66 66 65 | 72 20 6e 69 6c 20 22 5c |ol-buffe|r nil "\|
|00004010| 0a 54 68 65 20 63 6f 6e | 74 72 6f 6c 20 62 75 66 |.The con|trol buf|
|00004020| 66 65 72 20 6f 66 20 65 | 64 69 66 66 2e 20 22 29 |fer of e|diff. ")|
|00004030| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00004040| 88 c2 c1 c3 c4 0d 5c 22 | 83 11 00 c6 82 12 00 c7 |......\"|........|
|00004050| c8 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00004060| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00004070| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 62 | ediff-c|ontrol-b|
|00004080| 75 66 66 65 72 20 70 75 | 74 20 73 74 72 69 6e 67 |uffer pu|t string|
|00004090| 2d 6d 61 74 63 68 20 22 | 4c 75 63 69 64 22 20 65 |-match "|Lucid" e|
|000040a0| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 70 65 72 |macs-ver|sion per|
|000040b0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|000040c0| 73 65 72 76 65 64 20 74 | 5d 20 35 29 0a 28 64 65 |served t|] 5).(de|
|000040d0| 66 76 61 72 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |fvar edi|ff-contr|
|000040e0| 6f 6c 2d 77 69 6e 64 6f | 77 20 6e 69 6c 20 22 5c |ol-windo|w nil "\|
|000040f0| 0a 54 68 65 20 63 6f 6e | 74 72 6f 6c 20 77 69 6e |.The con|trol win|
|00004100| 64 6f 77 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |dow.").(|byte-cod|
|00004110| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 0d 5c 22 83 11 |e "..!..|....\"..|
|00004120| 00 c6 82 12 00 c7 c8 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00004130| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00004140| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 63 6f 6e |-local e|diff-con|
|00004150| 74 72 6f 6c 2d 77 69 6e | 64 6f 77 20 70 75 74 20 |trol-win|dow put |
|00004160| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 22 4c 75 |string-m|atch "Lu|
|00004170| 63 69 64 22 20 65 6d 61 | 63 73 2d 76 65 72 73 69 |cid" ema|cs-versi|
|00004180| 6f 6e 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |on perma|nent-loc|
|00004190| 61 6c 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |al prese|rved t] |
|000041a0| 35 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |5).(defv|ar ediff|
|000041b0| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 2d 73 |-window-|config-s|
|000041c0| 61 76 65 64 20 22 22 20 | 22 5c 0a 45 64 69 66 66 |aved "" |"\.Ediff|
|000041d0| 27 73 20 77 69 6e 64 6f | 77 20 63 6f 6e 66 69 67 |'s windo|w config|
|000041e0| 75 72 61 74 69 6f 6e 2e | 0a 55 73 65 64 20 74 6f |uration.|.Used to|
|000041f0| 20 6d 69 6e 69 6d 69 7a | 65 20 74 68 65 20 6e 65 | minimiz|e the ne|
|00004200| 65 64 20 74 6f 20 72 65 | 61 72 72 61 6e 67 65 20 |ed to re|arrange |
|00004210| 77 69 6e 64 6f 77 73 2e | 22 29 0a 28 62 79 74 65 |windows.|").(byte|
|00004220| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 0d |-code ".|.!......|
|00004230| 5c 22 83 11 00 c6 82 12 | 00 c7 c8 23 87 22 20 5b |\"......|...#." [|
|00004240| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004250| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004260| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 2d 73 |-window-|config-s|
|00004270| 61 76 65 64 20 70 75 74 | 20 73 74 72 69 6e 67 2d |aved put| string-|
|00004280| 6d 61 74 63 68 20 22 4c | 75 63 69 64 22 20 65 6d |match "L|ucid" em|
|00004290| 61 63 73 2d 76 65 72 73 | 69 6f 6e 20 70 65 72 6d |acs-vers|ion perm|
|000042a0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 70 72 65 73 |anent-lo|cal pres|
|000042b0| 65 72 76 65 64 20 74 5d | 20 35 29 0a 28 64 65 66 |erved t]| 5).(def|
|000042c0| 76 61 72 20 65 64 69 66 | 66 2d 41 2d 62 75 66 66 |var edif|f-A-buff|
|000042d0| 65 72 2d 76 61 6c 75 65 | 73 20 6e 69 6c 20 22 5c |er-value|s nil "\|
|000042e0| 0a 4b 65 65 70 73 20 77 | 6f 72 6b 69 6e 67 20 76 |.Keeps w|orking v|
|000042f0| 61 6c 75 65 73 20 6f 66 | 20 65 64 69 66 66 2d 73 |alues of| ediff-s|
|00004300| 61 76 65 64 2d 76 61 72 | 69 61 62 6c 65 73 20 66 |aved-var|iables f|
|00004310| 6f 72 20 65 64 69 66 66 | 2d 41 2d 62 75 66 66 65 |or ediff|-A-buffe|
|00004320| 72 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |r.").(by|te-code |
|00004330| 22 c0 c1 21 88 c2 c1 c3 | c4 0d 5c 22 83 11 00 c6 |"..!....|..\"....|
|00004340| 82 12 00 c7 c8 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00004350| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00004360| 6f 63 61 6c 20 65 64 69 | 66 66 2d 41 2d 62 75 66 |ocal edi|ff-A-buf|
|00004370| 66 65 72 2d 76 61 6c 75 | 65 73 20 70 75 74 20 73 |fer-valu|es put s|
|00004380| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 4c 75 63 |tring-ma|tch "Luc|
|00004390| 69 64 22 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |id" emac|s-versio|
|000043a0| 6e 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |n perman|ent-loca|
|000043b0| 6c 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 35 |l preser|ved t] 5|
|000043c0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|000043d0| 42 2d 62 75 66 66 65 72 | 2d 76 61 6c 75 65 73 20 |B-buffer|-values |
|000043e0| 6e 69 6c 20 22 5c 0a 4b | 65 65 70 73 20 77 6f 72 |nil "\.K|eeps wor|
|000043f0| 6b 69 6e 67 20 76 61 6c | 75 65 73 20 6f 66 20 65 |king val|ues of e|
|00004400| 64 69 66 66 2d 73 61 76 | 65 64 2d 76 61 72 69 61 |diff-sav|ed-varia|
|00004410| 62 6c 65 73 20 66 6f 72 | 20 65 64 69 66 66 2d 42 |bles for| ediff-B|
|00004420| 2d 62 75 66 66 65 72 2e | 22 29 0a 28 62 79 74 65 |-buffer.|").(byte|
|00004430| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 0d |-code ".|.!......|
|00004440| 5c 22 83 11 00 c6 82 12 | 00 c7 c8 23 87 22 20 5b |\"......|...#." [|
|00004450| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004460| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004470| 2d 42 2d 62 75 66 66 65 | 72 2d 76 61 6c 75 65 73 |-B-buffe|r-values|
|00004480| 20 70 75 74 20 73 74 72 | 69 6e 67 2d 6d 61 74 63 | put str|ing-matc|
|00004490| 68 20 22 4c 75 63 69 64 | 22 20 65 6d 61 63 73 2d |h "Lucid|" emacs-|
|000044a0| 76 65 72 73 69 6f 6e 20 | 70 65 72 6d 61 6e 65 6e |version |permanen|
|000044b0| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|000044c0| 64 20 74 5d 20 35 29 0a | 28 64 65 66 76 61 72 20 |d t] 5).|(defvar |
|000044d0| 65 64 69 66 66 2d 41 2d | 62 75 66 66 65 72 2d 76 |ediff-A-|buffer-v|
|000044e0| 61 6c 75 65 73 2d 73 65 | 74 75 70 20 6e 69 6c 20 |alues-se|tup nil |
|000044f0| 22 5c 0a 52 65 6d 65 6d | 62 65 72 73 20 65 64 69 |"\.Remem|bers edi|
|00004500| 66 66 2d 73 61 76 65 64 | 2d 76 61 72 69 61 62 6c |ff-saved|-variabl|
|00004510| 65 73 20 66 6f 72 20 65 | 64 69 66 66 2d 41 2d 62 |es for e|diff-A-b|
|00004520| 75 66 66 65 72 20 61 73 | 20 74 68 65 79 20 77 65 |uffer as| they we|
|00004530| 72 65 20 61 74 20 73 65 | 74 75 70 2e 22 29 0a 28 |re at se|tup.").(|
|00004540| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00004550| c1 c3 c4 0d 5c 22 83 11 | 00 c6 82 12 00 c7 c8 23 |....\"..|.......#|
|00004560| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00004570| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00004580| 64 69 66 66 2d 41 2d 62 | 75 66 66 65 72 2d 76 61 |diff-A-b|uffer-va|
|00004590| 6c 75 65 73 2d 73 65 74 | 75 70 20 70 75 74 20 73 |lues-set|up put s|
|000045a0| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 4c 75 63 |tring-ma|tch "Luc|
|000045b0| 69 64 22 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |id" emac|s-versio|
|000045c0| 6e 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |n perman|ent-loca|
|000045d0| 6c 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 35 |l preser|ved t] 5|
|000045e0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|000045f0| 42 2d 62 75 66 66 65 72 | 2d 76 61 6c 75 65 73 2d |B-buffer|-values-|
|00004600| 73 65 74 75 70 20 6e 69 | 6c 20 22 5c 0a 52 65 6d |setup ni|l "\.Rem|
|00004610| 65 6d 62 65 72 73 20 65 | 64 69 66 66 2d 73 61 76 |embers e|diff-sav|
|00004620| 65 64 2d 76 61 72 69 61 | 62 6c 65 73 20 66 6f 72 |ed-varia|bles for|
|00004630| 20 65 64 69 66 66 2d 42 | 2d 62 75 66 66 65 72 20 | ediff-B|-buffer |
|00004640| 61 73 20 74 68 65 79 20 | 77 65 72 65 20 61 74 20 |as they |were at |
|00004650| 73 65 74 75 70 2e 22 29 | 0a 28 62 79 74 65 2d 63 |setup.")|.(byte-c|
|00004660| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 0d 5c 22 |ode "..!|......\"|
|00004670| 83 11 00 c6 82 12 00 c7 | c8 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00004680| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004690| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 42 |er-local| ediff-B|
|000046a0| 2d 62 75 66 66 65 72 2d | 76 61 6c 75 65 73 2d 73 |-buffer-|values-s|
|000046b0| 65 74 75 70 20 70 75 74 | 20 73 74 72 69 6e 67 2d |etup put| string-|
|000046c0| 6d 61 74 63 68 20 22 4c | 75 63 69 64 22 20 65 6d |match "L|ucid" em|
|000046d0| 61 63 73 2d 76 65 72 73 | 69 6f 6e 20 70 65 72 6d |acs-vers|ion perm|
|000046e0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 70 72 65 73 |anent-lo|cal pres|
|000046f0| 65 72 76 65 64 20 74 5d | 20 35 29 0a 28 64 65 66 |erved t]| 5).(def|
|00004700| 76 61 72 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |var edif|f-differ|
|00004710| 65 6e 63 65 2d 76 65 63 | 74 6f 72 20 6e 69 6c 20 |ence-vec|tor nil |
|00004720| 22 5c 0a 56 65 63 74 6f | 72 20 6f 66 20 64 69 66 |"\.Vecto|r of dif|
|00004730| 66 65 72 65 6e 63 65 73 | 20 62 65 74 77 65 65 6e |ferences| between|
|00004740| 20 74 68 65 20 76 61 72 | 69 61 6e 74 73 2e 20 0a | the var|iants. .|
|00004750| 45 61 63 68 20 64 69 66 | 66 65 72 65 6e 63 65 20 |Each dif|ference |
|00004760| 69 73 20 72 65 70 72 65 | 73 65 6e 74 65 64 20 62 |is repre|sented b|
|00004770| 79 20 61 20 76 65 63 74 | 6f 72 20 6f 66 20 74 77 |y a vect|or of tw|
|00004780| 6f 20 6f 76 65 72 6c 61 | 79 73 2e 20 20 54 68 65 |o overla|ys. The|
|00004790| 20 66 69 72 73 74 0a 6f | 76 65 72 6c 61 79 73 20 | first.o|verlays |
|000047a0| 74 68 65 20 64 69 66 66 | 65 72 65 6e 63 65 20 73 |the diff|erence s|
|000047b0| 65 63 74 69 6f 6e 20 69 | 6e 20 74 68 65 20 41 20 |ection i|n the A |
|000047c0| 62 75 66 66 65 72 20 61 | 6e 64 20 74 68 65 20 73 |buffer a|nd the s|
|000047d0| 65 63 6f 6e 64 20 6f 76 | 65 72 6c 61 79 73 20 74 |econd ov|erlays t|
|000047e0| 68 65 0a 64 69 66 66 20 | 69 6e 20 74 68 65 20 42 |he.diff |in the B|
|000047f0| 20 62 75 66 66 65 72 2e | 20 49 66 20 61 20 64 69 | buffer.| If a di|
|00004800| 66 66 65 72 65 6e 63 65 | 20 73 65 63 74 69 6f 6e |fference| section|
|00004810| 20 69 73 20 65 6d 70 74 | 79 2c 20 74 68 65 20 63 | is empt|y, the c|
|00004820| 6f 72 72 65 73 70 6f 6e | 64 69 6e 67 0a 6f 76 65 |orrespon|ding.ove|
|00004830| 72 6c 61 79 27 73 20 65 | 6e 64 70 6f 69 6e 74 73 |rlay's e|ndpoints|
|00004840| 20 63 6f 69 6e 63 69 64 | 65 2e 20 22 29 0a 28 62 | coincid|e. ").(b|
|00004850| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00004860| c3 c4 0d 5c 22 83 11 00 | c6 82 12 00 c7 c8 23 87 |...\"...|......#.|
|00004870| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00004880| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00004890| 69 66 66 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 76 |iff-diff|erence-v|
|000048a0| 65 63 74 6f 72 20 70 75 | 74 20 73 74 72 69 6e 67 |ector pu|t string|
|000048b0| 2d 6d 61 74 63 68 20 22 | 4c 75 63 69 64 22 20 65 |-match "|Lucid" e|
|000048c0| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 70 65 72 |macs-ver|sion per|
|000048d0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|000048e0| 73 65 72 76 65 64 20 74 | 5d 20 35 29 0a 28 64 65 |served t|] 5).(de|
|000048f0| 66 76 61 72 20 65 64 69 | 66 66 2d 63 75 72 72 65 |fvar edi|ff-curre|
|00004900| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 2d 31 |nt-diffe|rence -1|
|00004910| 20 22 5c 0a 54 68 65 20 | 64 69 66 66 65 72 65 6e | "\.The |differen|
|00004920| 63 65 20 74 68 61 74 20 | 69 73 20 63 75 72 72 65 |ce that |is curre|
|00004930| 6e 74 6c 79 20 73 65 6c | 65 63 74 65 64 2e 22 29 |ntly sel|ected.")|
|00004940| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00004950| 88 c2 c1 c3 c4 0d 5c 22 | 83 11 00 c6 82 12 00 c7 |......\"|........|
|00004960| c8 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00004970| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00004980| 20 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 | ediff-c|urrent-d|
|00004990| 69 66 66 65 72 65 6e 63 | 65 20 70 75 74 20 73 74 |ifferenc|e put st|
|000049a0| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|000049b0| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|000049c0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|000049d0| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 35 29 | preserv|ed t] 5)|
|000049e0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 6e |.(defvar| ediff-n|
|000049f0| 75 6d 62 65 72 2d 6f 66 | 2d 64 69 66 66 65 72 65 |umber-of|-differe|
|00004a00| 6e 63 65 73 20 6e 69 6c | 20 22 5c 0a 4e 75 6d 62 |nces nil| "\.Numb|
|00004a10| 65 72 20 6f 66 20 64 69 | 66 66 65 72 65 6e 63 65 |er of di|fference|
|00004a20| 73 20 66 6f 75 6e 64 2e | 22 29 0a 28 62 79 74 65 |s found.|").(byte|
|00004a30| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 0d |-code ".|.!......|
|00004a40| 5c 22 83 11 00 c6 82 12 | 00 c7 c8 23 87 22 20 5b |\"......|...#." [|
|00004a50| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004a60| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004a70| 2d 6e 75 6d 62 65 72 2d | 6f 66 2d 64 69 66 66 65 |-number-|of-diffe|
|00004a80| 72 65 6e 63 65 73 20 70 | 75 74 20 73 74 72 69 6e |rences p|ut strin|
|00004a90| 67 2d 6d 61 74 63 68 20 | 22 4c 75 63 69 64 22 20 |g-match |"Lucid" |
|00004aa0| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 20 70 65 |emacs-ve|rsion pe|
|00004ab0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00004ac0| 65 73 65 72 76 65 64 20 | 74 5d 20 35 29 0a 28 64 |eserved |t] 5).(d|
|00004ad0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 64 69 66 66 |efvar ed|iff-diff|
|00004ae0| 2d 62 75 66 66 65 72 20 | 6e 69 6c 20 22 5c 0a 42 |-buffer |nil "\.B|
|00004af0| 75 66 66 65 72 20 63 6f | 6e 74 61 69 6e 69 6e 67 |uffer co|ntaining|
|00004b00| 20 74 68 65 20 6f 75 74 | 70 75 74 20 6f 66 20 64 | the out|put of d|
|00004b10| 69 66 66 2c 20 77 68 69 | 63 68 20 69 73 20 75 73 |iff, whi|ch is us|
|00004b20| 65 64 20 62 79 20 45 64 | 69 66 66 20 74 6f 20 73 |ed by Ed|iff to s|
|00004b30| 74 65 70 0a 74 68 72 6f | 75 67 68 20 66 69 6c 65 |tep.thro|ugh file|
|00004b40| 73 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |s.").(by|te-code |
|00004b50| 22 c0 c1 21 88 c2 c1 c3 | c4 0d 5c 22 83 11 00 c6 |"..!....|..\"....|
|00004b60| 82 12 00 c7 c8 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00004b70| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00004b80| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 69 66 66 2d |ocal edi|ff-diff-|
|00004b90| 62 75 66 66 65 72 20 70 | 75 74 20 73 74 72 69 6e |buffer p|ut strin|
|00004ba0| 67 2d 6d 61 74 63 68 20 | 22 4c 75 63 69 64 22 20 |g-match |"Lucid" |
|00004bb0| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 20 70 65 |emacs-ve|rsion pe|
|00004bc0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00004bd0| 65 73 65 72 76 65 64 20 | 74 5d 20 35 29 0a 28 64 |eserved |t] 5).(d|
|00004be0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 66 69 6e 65 |efvar ed|iff-fine|
|00004bf0| 2d 64 69 66 66 2d 62 75 | 66 66 65 72 20 6e 69 6c |-diff-bu|ffer nil|
|00004c00| 20 22 5c 0a 42 75 66 66 | 65 72 20 75 73 65 64 20 | "\.Buff|er used |
|00004c10| 66 6f 72 20 64 69 66 66 | 2d 73 74 79 6c 65 20 66 |for diff|-style f|
|00004c20| 69 6e 65 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 |ine diff|erences |
|00004c30| 62 65 74 77 65 65 6e 20 | 72 65 67 69 6f 6e 73 2e |between |regions.|
|00004c40| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00004c50| c1 21 88 c2 c1 c3 c4 0d | 5c 22 83 11 00 c6 82 12 |.!......|\"......|
|00004c60| 00 c7 c8 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00004c70| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00004c80| 61 6c 20 65 64 69 66 66 | 2d 66 69 6e 65 2d 64 69 |al ediff|-fine-di|
|00004c90| 66 66 2d 62 75 66 66 65 | 72 20 70 75 74 20 73 74 |ff-buffe|r put st|
|00004ca0| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|00004cb0| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|00004cc0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00004cd0| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 35 29 | preserv|ed t] 5)|
|00004ce0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 74 |.(defvar| ediff-t|
|00004cf0| 6d 70 2d 62 75 66 66 65 | 72 20 6e 69 6c 20 22 5c |mp-buffe|r nil "\|
|00004d00| 0a 54 65 6d 70 6f 72 61 | 72 79 20 62 75 66 66 65 |.Tempora|ry buffe|
|00004d10| 72 20 75 73 65 64 20 66 | 6f 72 20 63 6f 6d 70 75 |r used f|or compu|
|00004d20| 74 69 6e 67 20 66 69 6e | 65 20 64 69 66 66 65 72 |ting fin|e differ|
|00004d30| 65 6e 63 65 73 2e 22 29 | 0a 28 62 79 74 65 2d 63 |ences.")|.(byte-c|
|00004d40| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 0d 5c 22 |ode "..!|......\"|
|00004d50| 83 11 00 c6 82 12 00 c7 | c8 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00004d60| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004d70| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 74 |er-local| ediff-t|
|00004d80| 6d 70 2d 62 75 66 66 65 | 72 20 70 75 74 20 73 74 |mp-buffe|r put st|
|00004d90| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|00004da0| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|00004db0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00004dc0| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 35 29 | preserv|ed t] 5)|
|00004dd0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 65 |.(defvar| ediff-e|
|00004de0| 72 72 6f 72 2d 62 75 66 | 66 65 72 20 6e 69 6c 20 |rror-buf|fer nil |
|00004df0| 22 5c 0a 42 75 66 66 65 | 72 20 63 6f 6e 74 61 69 |"\.Buffe|r contai|
|00004e00| 6e 69 6e 67 20 74 68 65 | 20 6f 75 74 70 75 74 20 |ning the| output |
|00004e10| 6f 66 20 64 69 66 66 20 | 77 68 65 6e 20 64 69 66 |of diff |when dif|
|00004e20| 66 20 72 65 74 75 72 6e | 73 20 65 72 72 6f 72 73 |f return|s errors|
|00004e30| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00004e40| c0 c1 21 88 c2 c1 c3 c4 | 0d 5c 22 83 11 00 c6 82 |..!.....|.\".....|
|00004e50| 12 00 c7 c8 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00004e60| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004e70| 63 61 6c 20 65 64 69 66 | 66 2d 65 72 72 6f 72 2d |cal edif|f-error-|
|00004e80| 62 75 66 66 65 72 20 70 | 75 74 20 73 74 72 69 6e |buffer p|ut strin|
|00004e90| 67 2d 6d 61 74 63 68 20 | 22 4c 75 63 69 64 22 20 |g-match |"Lucid" |
|00004ea0| 65 6d 61 63 73 2d 76 65 | 72 73 69 6f 6e 20 70 65 |emacs-ve|rsion pe|
|00004eb0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00004ec0| 65 73 65 72 76 65 64 20 | 74 5d 20 35 29 0a 28 64 |eserved |t] 5).(d|
|00004ed0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 74 68 69 73 |efvar ed|iff-this|
|00004ee0| 2d 62 75 66 66 65 72 2d | 63 6f 6e 74 72 6f 6c 2d |-buffer-|control-|
|00004ef0| 73 65 73 73 69 6f 6e 73 | 20 6e 69 6c 20 22 5c 0a |sessions| nil "\.|
|00004f00| 4c 69 73 74 20 6f 66 20 | 65 64 69 66 66 20 63 6f |List of |ediff co|
|00004f10| 6e 74 72 6f 6c 20 70 61 | 6e 65 6c 73 20 61 73 73 |ntrol pa|nels ass|
|00004f20| 6f 63 69 61 74 65 64 20 | 77 69 74 68 20 65 61 63 |ociated |with eac|
|00004f30| 68 20 62 75 66 66 65 72 | 20 41 2f 42 2e 22 29 0a |h buffer| A/B.").|
|00004f40| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00004f50| c2 c1 c3 c4 0d 5c 22 83 | 11 00 c6 82 12 00 c7 c8 |.....\".|........|
|00004f60| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00004f70| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00004f80| 65 64 69 66 66 2d 74 68 | 69 73 2d 62 75 66 66 65 |ediff-th|is-buffe|
|00004f90| 72 2d 63 6f 6e 74 72 6f | 6c 2d 73 65 73 73 69 6f |r-contro|l-sessio|
|00004fa0| 6e 73 20 70 75 74 20 73 | 74 72 69 6e 67 2d 6d 61 |ns put s|tring-ma|
|00004fb0| 74 63 68 20 22 4c 75 63 | 69 64 22 20 65 6d 61 63 |tch "Luc|id" emac|
|00004fc0| 73 2d 76 65 72 73 69 6f | 6e 20 70 65 72 6d 61 6e |s-versio|n perman|
|00004fd0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 70 72 65 73 65 72 |ent-loca|l preser|
|00004fe0| 76 65 64 20 74 5d 20 35 | 29 0a 28 64 65 66 76 61 |ved t] 5|).(defva|
|00004ff0| 72 20 65 64 69 66 66 2d | 64 69 73 74 75 72 62 65 |r ediff-|disturbe|
|00005000| 64 2d 6f 76 65 72 6c 61 | 79 73 20 6e 69 6c 20 22 |d-overla|ys nil "|
|00005010| 5c 0a 4c 69 73 74 20 6f | 66 20 64 69 66 66 65 72 |\.List o|f differ|
|00005020| 65 6e 63 65 20 6f 76 65 | 72 6c 61 79 73 20 64 69 |ence ove|rlays di|
|00005030| 73 74 75 72 62 65 64 20 | 62 79 20 77 6f 72 6b 69 |sturbed |by worki|
|00005040| 6e 67 20 77 69 74 68 20 | 74 68 65 20 63 75 72 72 |ng with |the curr|
|00005050| 65 6e 74 20 64 69 66 66 | 2e 22 29 0a 28 64 65 66 |ent diff|.").(def|
|00005060| 76 61 72 20 65 64 69 66 | 66 2d 73 68 61 64 65 64 |var edif|f-shaded|
|00005070| 2d 6f 76 65 72 6c 61 79 | 2d 70 72 69 6f 72 69 74 |-overlay|-priorit|
|00005080| 79 20 31 30 30 20 22 5c | 0a 50 72 69 6f 72 69 74 |y 100 "\|.Priorit|
|00005090| 79 20 6f 66 20 6e 6f 6e | 2d 73 65 6c 65 63 74 65 |y of non|-selecte|
|000050a0| 64 20 6f 76 65 72 6c 61 | 79 73 2e 22 29 0a 28 62 |d overla|ys.").(b|
|000050b0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 5c 6e 5c 22 |yte-code| "..\n\"|
|000050c0| 83 32 00 c3 c4 4b 4d 88 | c5 c6 4b 4d 88 c7 c8 4b |.2...KM.|..KM...K|
|000050d0| 4d 88 c9 ca 4b 4d 88 cb | cc 4b 4d 88 cd ce 4b 4d |M...KM..|.KM...KM|
|000050e0| 88 cf d0 4b 4d 88 d1 d2 | 4b 4d 88 82 5a 00 c3 d3 |...KM...|KM..Z...|
|000050f0| 4b 4d 88 c5 d4 4b 4d 88 | c7 d5 4b 4d 88 c9 d6 4b |KM...KM.|..KM...K|
|00005100| 4d 88 cb d7 4b 4d 88 cd | d8 4b 4d 88 cf d9 4b 4d |M...KM..|.KM...KM|
|00005110| 88 d1 da 4b 4d 88 0e 1b | 83 ac 00 c0 c1 5c 6e 5c |...KM...|.....\n\|
|00005120| 22 83 82 00 dc dd 4b 4d | 88 de df 4b 4d 88 e0 e1 |".....KM|...KM...|
|00005130| 4b 4d 88 e2 e3 4b 4d 88 | e4 e5 4b 4d 88 82 bd 00 |KM...KM.|..KM....|
|00005140| de e6 4b 4d 88 dc e7 4b | 4d 88 e0 e8 4b 4d 88 0e |..KM...K|M...KM..|
|00005150| 1b e9 3d 83 9f 00 e2 ea | 4d 88 82 a4 00 e2 eb 4b |..=.....|M......K|
|00005160| 4d 88 e4 ec 4b 4d 88 82 | bd 00 de ed 4d 88 dc ee |M...KM..|....M...|
|00005170| 4b 4d 88 ef f0 4d 88 f1 | f2 4d 88 0e 1b 83 18 04 |KM...M..|.M......|
|00005180| f3 f4 4d 88 f5 f6 21 84 | 01 01 f7 f6 21 88 f8 f6 |..M...!.|....!...|
|00005190| 21 84 fe 00 e0 20 83 ea | 00 f3 f9 f6 fa 23 88 f3 |!.... ..|.....#..|
|000051a0| fb f6 fc 23 88 82 fe 00 | c0 c1 5c 6e 5c 22 83 f9 |...#....|..\n\"..|
|000051b0| 00 fd fe f6 5c 22 88 82 | fe 00 fd ff f6 5c 22 88 |....\"..|.....\".|
|000051c0| f6 16 36 81 40 00 f6 81 | 41 00 81 42 00 23 88 f5 |..6.@...|A..B.#..|
|000051d0| 81 43 00 21 84 5c 5c 01 | f7 81 43 00 21 88 f8 81 |.C.!.\\.|..C.!...|
|000051e0| 43 00 21 84 57 01 e0 20 | 83 3f 01 f3 f9 81 43 00 |C.!.W.. |.?....C.|
|000051f0| 81 44 00 23 88 f3 fb 81 | 43 00 81 45 00 23 88 82 |.D.#....|C..E.#..|
|00005200| 57 01 c0 c1 5c 6e 5c 22 | 83 50 01 fd fe 81 43 00 |W...\n\"|.P....C.|
|00005210| 5c 22 88 82 57 01 fd ff | 81 43 00 5c 22 88 81 43 |\"..W...|.C.\"..C|
|00005220| 00 16 43 81 40 00 81 43 | 00 81 41 00 81 46 00 23 |..C.@..C|..A..F.#|
|00005230| 88 f5 81 47 00 21 84 c2 | 01 f7 81 47 00 21 88 f8 |...G.!..|...G.!..|
|00005240| 81 47 00 21 84 bd 01 e0 | 20 83 9c 01 f3 f9 81 47 |.G.!....| ......G|
|00005250| 00 81 48 00 23 88 f3 fb | 81 47 00 81 49 00 23 88 |..H.#...|.G..I.#.|
|00005260| 82 bd 01 81 47 00 81 4a | 00 81 4b 00 1e 4c 1e 4d |....G..J|..K..L.M|
|00005270| 1e 4e 81 4f 00 0e 4e 81 | 50 00 0e 4d 81 51 00 0e |.N.O..N.|P..M.Q..|
|00005280| 4c 25 88 2b 81 47 00 16 | 47 81 40 00 81 47 00 81 |L%.+.G..|G.@..G..|
|00005290| 41 00 81 52 00 23 88 f5 | 81 53 00 21 84 28 02 f7 |A..R.#..|.S.!.(..|
|000052a0| 81 53 00 21 88 f8 81 53 | 00 21 84 23 02 e0 20 83 |.S.!...S|.!.#.. .|
|000052b0| 02 02 f3 f9 81 53 00 81 | 54 00 23 88 f3 fb 81 53 |.....S..|T.#....S|
|000052c0| 00 81 55 00 23 88 82 23 | 02 81 53 00 81 4a 00 81 |..U.#..#|..S..J..|
|000052d0| 4b 00 1e 4c 1e 4d 1e 4e | 81 4f 00 0e 4e 81 50 00 |K..L.M.N|.O..N.P.|
|000052e0| 0e 4d 81 51 00 0e 4c 25 | 88 2b 81 53 00 16 53 81 |.M.Q..L%|.+.S..S.|
|000052f0| 40 00 81 53 00 81 41 00 | 81 56 00 23 88 f5 81 57 |@..S..A.|.V.#...W|
|00005300| 00 21 84 76 02 f7 81 57 | 00 21 88 f8 81 57 00 21 |.!.v...W|.!...W.!|
|00005310| 84 71 02 e0 20 83 68 02 | f3 f9 81 57 00 81 58 00 |.q.. .h.|...W..X.|
|00005320| 23 88 f3 fb 81 57 00 81 | 59 00 23 88 82 71 02 fd |#....W..|Y.#..q..|
|00005330| 81 5a 00 81 57 00 5c 22 | 88 81 57 00 16 57 81 40 |.Z..W.\"|..W..W.@|
|00005340| 00 81 57 00 81 41 00 81 | 5b 00 23 88 f5 81 5c 5c |..W..A..|[.#...\\|
|00005350| 00 21 84 c4 02 f7 81 5c | 5c 00 21 88 f8 81 5c 5c |.!.....\|\.!...\\|
|00005360| 00 21 84 bf 02 e0 20 83 | b6 02 f3 f9 81 5c 5c 00 |.!.... .|.....\\.|
|00005370| 81 5d 00 23 88 f3 fb 81 | 5c 5c 00 81 5e 00 23 88 |.].#....|\\..^.#.|
|00005380| 82 bf 02 fd 81 5a 00 81 | 5c 5c 00 5c 22 88 81 5c |.....Z..|\\.\"..\|
|00005390| 5c 00 16 5c 5c 81 40 00 | 81 5c 5c 00 81 41 00 81 |\..\\.@.|.\\..A..|
|000053a0| 5f 00 23 88 f5 81 60 00 | 21 84 12 03 f7 81 60 00 |_.#...`.|!.....`.|
|000053b0| 21 88 f8 81 60 00 21 84 | 0d 03 e0 20 83 04 03 f3 |!...`.!.|... ....|
|000053c0| f9 81 60 00 81 5d 00 23 | 88 f3 fb 81 60 00 81 5e |..`..].#|....`..^|
|000053d0| 00 23 88 82 0d 03 fd 81 | 5a 00 81 60 00 5c 22 88 |.#......|Z..`.\".|
|000053e0| 81 60 00 16 60 81 40 00 | 81 60 00 81 41 00 81 61 |.`..`.@.|.`..A..a|
|000053f0| 00 23 88 f5 81 62 00 21 | 84 60 03 f7 81 62 00 21 |.#...b.!|.`...b.!|
|00005400| 88 f8 81 62 00 21 84 5b | 03 e0 20 83 52 03 f3 f9 |...b.!.[|.. .R...|
|00005410| 81 62 00 81 54 00 23 88 | f3 fb 81 62 00 81 59 00 |.b..T.#.|...b..Y.|
|00005420| 23 88 82 5b 03 fd 81 5a | 00 81 62 00 5c 22 88 81 |#..[...Z|..b.\"..|
|00005430| 62 00 16 62 81 40 00 81 | 62 00 81 41 00 81 63 00 |b..b.@..|b..A..c.|
|00005440| 23 88 f7 81 64 00 21 88 | f7 81 65 00 21 88 f7 81 |#...d.!.|..e.!...|
|00005450| 66 00 21 88 f7 81 67 00 | 21 88 81 68 00 81 69 00 |f.!...g.|!..h..i.|
|00005460| 4d 88 f5 81 6a 00 21 84 | 9b 03 81 4b 00 16 6a 81 |M...j.!.|...K..j.|
|00005470| 40 00 81 6a 00 81 41 00 | 81 6b 00 23 88 81 6c 00 |@..j..A.|.k.#..l.|
|00005480| 81 6a 00 21 88 81 40 00 | 81 6a 00 c0 c1 5c 6e 5c |.j.!..@.|.j...\n\|
|00005490| 22 83 c4 03 81 6d 00 82 | c7 03 81 6e 00 81 4a 00 |"....m..|...n..J.|
|000054a0| 23 88 f5 81 6f 00 21 84 | d9 03 81 4b 00 16 6f 81 |#...o.!.|...K..o.|
|000054b0| 40 00 81 6f 00 81 41 00 | 81 70 00 23 88 81 6c 00 |@..o..A.|.p.#..l.|
|000054c0| 81 6f 00 21 88 81 40 00 | 81 6f 00 c0 c1 5c 6e 5c |.o.!..@.|.o...\n\|
|000054d0| 22 83 02 04 81 6d 00 82 | 05 04 81 6e 00 81 4a 00 |"....m..|...n..J.|
|000054e0| 23 88 ef 81 71 00 4d 88 | 81 72 00 81 73 00 4d 88 |#...q.M.|.r..s.M.|
|000054f0| 81 4b 00 87 22 20 5b 73 | 74 72 69 6e 67 2d 6d 61 |.K.." [s|tring-ma|
|00005500| 74 63 68 20 22 4c 75 63 | 69 64 22 20 65 6d 61 63 |tch "Luc|id" emac|
|00005510| 73 2d 76 65 72 73 69 6f | 6e 20 65 64 69 66 66 2d |s-versio|n ediff-|
|00005520| 6f 76 65 72 6c 61 79 70 | 20 65 78 74 65 6e 74 70 |overlayp| extentp|
|00005530| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 6f 76 65 72 | ediff-m|ake-over|
|00005540| 6c 61 79 20 6d 61 6b 65 | 2d 65 78 74 65 6e 74 20 |lay make|-extent |
|00005550| 65 64 69 66 66 2d 64 65 | 6c 65 74 65 2d 6f 76 65 |ediff-de|lete-ove|
|00005560| 72 6c 61 79 20 64 65 6c | 65 74 65 2d 65 78 74 65 |rlay del|ete-exte|
|00005570| 6e 74 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |nt ediff|-overlay|
|00005580| 2d 70 75 74 20 73 65 74 | 2d 65 78 74 65 6e 74 2d |-put set|-extent-|
|00005590| 70 72 6f 70 65 72 74 79 | 20 65 64 69 66 66 2d 6d |property| ediff-m|
|000055a0| 6f 76 65 2d 6f 76 65 72 | 6c 61 79 20 73 65 74 2d |ove-over|lay set-|
|000055b0| 65 78 74 65 6e 74 2d 65 | 6e 64 70 6f 69 6e 74 73 |extent-e|ndpoints|
|000055c0| 20 65 64 69 66 66 2d 6f | 76 65 72 6c 61 79 2d 73 | ediff-o|verlay-s|
|000055d0| 74 61 72 74 20 65 78 74 | 65 6e 74 2d 73 74 61 72 |tart ext|ent-star|
|000055e0| 74 2d 70 6f 73 69 74 69 | 6f 6e 20 65 64 69 66 66 |t-positi|on ediff|
|000055f0| 2d 6f 76 65 72 6c 61 79 | 2d 65 6e 64 20 65 78 74 |-overlay|-end ext|
|00005600| 65 6e 74 2d 65 6e 64 2d | 70 6f 73 69 74 69 6f 6e |ent-end-|position|
|00005610| 20 65 64 69 66 66 2d 6f | 76 65 72 6c 61 79 2d 67 | ediff-o|verlay-g|
|00005620| 65 74 20 65 78 74 65 6e | 74 2d 70 72 6f 70 65 72 |et exten|t-proper|
|00005630| 74 79 20 6f 76 65 72 6c | 61 79 70 20 6d 61 6b 65 |ty overl|ayp make|
|00005640| 2d 6f 76 65 72 6c 61 79 | 20 64 65 6c 65 74 65 2d |-overlay| delete-|
|00005650| 6f 76 65 72 6c 61 79 20 | 6f 76 65 72 6c 61 79 2d |overlay |overlay-|
|00005660| 70 75 74 20 6d 6f 76 65 | 2d 6f 76 65 72 6c 61 79 |put move|-overlay|
|00005670| 20 6f 76 65 72 6c 61 79 | 2d 73 74 61 72 74 20 6f | overlay|-start o|
|00005680| 76 65 72 6c 61 79 2d 65 | 6e 64 20 6f 76 65 72 6c |verlay-e|nd overl|
|00005690| 61 79 2d 67 65 74 20 77 | 69 6e 64 6f 77 2d 73 79 |ay-get w|indow-sy|
|000056a0| 73 74 65 6d 20 65 64 69 | 66 66 2d 73 65 6c 65 63 |stem edi|ff-selec|
|000056b0| 74 2d 66 72 61 6d 65 20 | 73 65 6c 65 63 74 2d 73 |t-frame |select-s|
|000056c0| 63 72 65 65 6e 20 65 64 | 69 66 66 2d 77 69 6e 64 |creen ed|iff-wind|
|000056d0| 6f 77 2d 66 72 61 6d 65 | 20 77 69 6e 64 6f 77 2d |ow-frame| window-|
|000056e0| 73 63 72 65 65 6e 20 65 | 64 69 66 66 2d 64 69 73 |screen e|diff-dis|
|000056f0| 70 6c 61 79 2d 63 6f 6c | 6f 72 2d 70 20 78 2d 63 |play-col|or-p x-c|
|00005700| 6f 6c 6f 72 2d 64 69 73 | 70 6c 61 79 2d 70 20 65 |olor-dis|play-p e|
|00005710| 64 69 66 66 2d 76 61 6c | 69 64 2d 63 6f 6c 6f 72 |diff-val|id-color|
|00005720| 2d 70 20 78 2d 76 61 6c | 69 64 2d 63 6f 6c 6f 72 |-p x-val|id-color|
|00005730| 2d 6e 61 6d 65 2d 70 20 | 65 64 69 66 66 2d 67 65 |-name-p |ediff-ge|
|00005740| 74 2d 66 61 63 65 20 67 | 65 74 2d 66 61 63 65 20 |t-face g|et-face |
|00005750| 77 69 6e 64 6f 77 2d 66 | 72 61 6d 65 20 73 65 6c |window-f|rame sel|
|00005760| 65 63 74 2d 66 72 61 6d | 65 20 78 2d 64 69 73 70 |ect-fram|e x-disp|
|00005770| 6c 61 79 2d 63 6f 6c 6f | 72 2d 70 20 70 6d 20 23 |lay-colo|r-p pm #|
|00005780| 5b 28 63 6f 6c 6f 72 29 | 20 22 c0 09 5c 6e 5c 22 |[(color)| "..\n\"|
|00005790| 87 22 20 5b 61 73 73 6f | 63 20 63 6f 6c 6f 72 20 |." [asso|c color |
|000057a0| 70 6d 2d 63 6f 6c 6f 72 | 2d 61 6c 69 73 74 5d 20 |pm-color|-alist] |
|000057b0| 33 5d 20 78 2d 63 6f 6c | 6f 72 2d 64 65 66 69 6e |3] x-col|or-defin|
|000057c0| 65 64 2d 70 20 69 6e 74 | 65 72 6e 61 6c 2d 67 65 |ed-p int|ernal-ge|
|000057d0| 74 2d 66 61 63 65 20 23 | 5b 28 77 69 6e 64 29 20 |t-face #|[(wind) |
|000057e0| 22 08 85 05 00 c1 87 22 | 20 5b 77 69 6e 64 20 31 |"......"| [wind 1|
|000057f0| 5d 20 31 5d 20 69 64 65 | 6e 74 69 74 79 20 65 64 |] 1] ide|ntity ed|
|00005800| 69 66 66 2d 6d 61 6b 65 | 2d 63 75 72 72 65 6e 74 |iff-make|-current|
|00005810| 2d 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 20 28 6c |-diff-ov|erlay (l|
|00005820| 61 6d 62 64 61 20 28 74 | 79 70 65 29 29 20 65 64 |ambda (t|ype)) ed|
|00005830| 69 66 66 2d 75 6e 68 69 | 67 68 6c 69 67 68 74 2d |iff-unhi|ghlight-|
|00005840| 64 69 66 66 73 2d 74 6f | 74 61 6c 6c 79 20 28 6c |diffs-to|tally (l|
|00005850| 61 6d 62 64 61 20 6e 69 | 6c 29 20 65 64 69 66 66 |ambda ni|l) ediff|
|00005860| 2d 73 65 74 2d 66 61 63 | 65 20 23 5b 28 67 72 6f |-set-fac|e #[(gro|
|00005870| 75 6e 64 20 66 61 63 65 | 20 63 6f 6c 6f 72 29 20 |und face| color) |
|00005880| 22 c0 09 21 83 2e 00 5c | 6e c3 3d 83 1d 00 5c 66 |"..!...\|n.=...\f|
|00005890| 09 c5 1e 06 19 1c c7 5c | 66 c3 09 c8 0e 06 25 2b |.......\|f.....%+|
|000058a0| 87 5c 66 09 c5 1e 06 19 | 1c c7 5c 66 c9 09 ca 0e |.\f.....|..\f....|
|000058b0| 06 25 2b 87 5c 66 cb 3e | 83 39 00 cc cd 5c 66 5c |.%+.\f.>|.9...\f\|
|000058c0| 22 87 5c 66 ce 3e 83 57 | 00 cc cf 5c 66 5c 22 88 |".\f.>.W|...\f\".|
|000058d0| 5c 66 d0 c5 1e 06 1e 11 | 1c c7 5c 66 d2 0e 11 d3 |\f......|..\f....|
|000058e0| 0e 06 25 2b 87 5c 66 d4 | 3e 85 61 00 cc cf 5c 66 |..%+.\f.|>.a...\f|
|000058f0| 5c 22 87 22 20 5b 65 64 | 69 66 66 2d 76 61 6c 69 |\"." [ed|iff-vali|
|00005900| 64 2d 63 6f 6c 6f 72 2d | 70 20 63 6f 6c 6f 72 20 |d-color-|p color |
|00005910| 67 72 6f 75 6e 64 20 66 | 6f 72 65 67 72 6f 75 6e |ground f|oregroun|
|00005920| 64 20 66 61 63 65 20 6e | 69 6c 20 66 72 61 6d 65 |d face n|il frame|
|00005930| 20 69 6e 74 65 72 6e 61 | 6c 2d 73 65 74 2d 66 61 | interna|l-set-fa|
|00005940| 63 65 2d 31 20 34 20 62 | 61 63 6b 67 72 6f 75 6e |ce-1 4 b|ackgroun|
|00005950| 64 20 35 20 28 65 64 69 | 66 66 2d 63 75 72 72 65 |d 5 (edi|ff-curre|
|00005960| 6e 74 2d 64 69 66 66 2d | 66 61 63 65 2d 41 20 65 |nt-diff-|face-A e|
|00005970| 64 69 66 66 2d 63 75 72 | 72 65 6e 74 2d 64 69 66 |diff-cur|rent-dif|
|00005980| 66 2d 66 61 63 65 2d 42 | 29 20 63 6f 70 79 2d 66 |f-face-B|) copy-f|
|00005990| 61 63 65 20 68 69 67 68 | 6c 69 67 68 74 20 28 65 |ace high|light (e|
|000059a0| 64 69 66 66 2d 66 69 6e | 65 2d 64 69 66 66 2d 66 |diff-fin|e-diff-f|
|000059b0| 61 63 65 2d 41 20 65 64 | 69 66 66 2d 66 69 6e 65 |ace-A ed|iff-fine|
|000059c0| 2d 64 69 66 66 2d 66 61 | 63 65 2d 42 29 20 73 65 |-diff-fa|ce-B) se|
|000059d0| 63 6f 6e 64 61 72 79 2d | 73 65 6c 65 63 74 69 6f |condary-|selectio|
|000059e0| 6e 20 74 20 75 6e 64 65 | 72 6c 69 6e 65 2d 70 20 |n t unde|rline-p |
|000059f0| 75 6e 64 65 72 6c 69 6e | 65 20 37 20 28 65 64 69 |underlin|e 7 (edi|
|00005a00| 66 66 2d 6f 64 64 2d 64 | 69 66 66 2d 66 61 63 65 |ff-odd-d|iff-face|
|00005a10| 2d 41 20 65 64 69 66 66 | 2d 6f 64 64 2d 64 69 66 |-A ediff|-odd-dif|
|00005a20| 66 2d 66 61 63 65 2d 42 | 20 65 64 69 66 66 2d 65 |f-face-B| ediff-e|
|00005a30| 76 65 6e 2d 64 69 66 66 | 2d 66 61 63 65 2d 41 20 |ven-diff|-face-A |
|00005a40| 65 64 69 66 66 2d 65 76 | 65 6e 2d 64 69 66 66 2d |ediff-ev|en-diff-|
|00005a50| 66 61 63 65 2d 42 29 5d | 20 36 20 22 53 65 74 73 |face-B)]| 6 "Sets|
|00005a60| 20 66 61 63 65 20 66 6f | 72 65 67 72 6f 75 6e 64 | face fo|reground|
|00005a70| 2f 62 61 63 6b 67 72 6f | 75 6e 64 2e 22 5d 20 62 |/backgro|und."] b|
|00005a80| 6f 75 6e 64 70 20 65 64 | 69 66 66 2d 63 75 72 72 |oundp ed|iff-curr|
|00005a90| 65 6e 74 2d 64 69 66 66 | 2d 66 61 63 65 2d 41 20 |ent-diff|-face-A |
|00005aa0| 6d 61 6b 65 2d 66 61 63 | 65 20 66 61 63 65 2d 64 |make-fac|e face-d|
|00005ab0| 69 66 66 65 72 73 2d 66 | 72 6f 6d 2d 64 65 66 61 |iffers-f|rom-defa|
|00005ac0| 75 6c 74 2d 70 20 66 6f | 72 65 67 72 6f 75 6e 64 |ult-p fo|reground|
|00005ad0| 20 22 66 69 72 65 62 72 | 69 63 6b 22 20 62 61 63 | "firebr|ick" bac|
|00005ae0| 6b 67 72 6f 75 6e 64 20 | 22 70 61 6c 65 20 67 72 |kground |"pale gr|
|00005af0| 65 65 6e 22 20 63 6f 70 | 79 2d 66 61 63 65 20 6d |een" cop|y-face m|
|00005b00| 6f 64 65 6c 69 6e 65 20 | 68 69 67 68 6c 69 67 68 |odeline |highligh|
|00005b10| 74 20 70 75 74 20 76 61 | 72 69 61 62 6c 65 2d 64 |t put va|riable-d|
|00005b20| 6f 63 75 6d 65 6e 74 61 | 74 69 6f 6e 20 22 46 61 |ocumenta|tion "Fa|
|00005b30| 63 65 20 66 6f 72 20 68 | 69 67 68 6c 69 67 68 74 |ce for h|ighlight|
|00005b40| 69 6e 67 20 74 68 65 20 | 73 65 6c 65 63 74 65 64 |ing the |selected|
|00005b50| 20 64 69 66 66 65 72 65 | 6e 63 65 20 69 6e 20 62 | differe|nce in b|
|00005b60| 75 66 66 65 72 20 41 2e | 22 20 65 64 69 66 66 2d |uffer A.|" ediff-|
|00005b70| 63 75 72 72 65 6e 74 2d | 64 69 66 66 2d 66 61 63 |current-|diff-fac|
|00005b80| 65 2d 42 20 22 44 61 72 | 6b 4f 72 63 68 69 64 22 |e-B "Dar|kOrchid"|
|00005b90| 20 22 59 65 6c 6c 6f 77 | 22 20 22 46 61 63 65 20 | "Yellow|" "Face |
|00005ba0| 66 6f 72 20 68 69 67 68 | 6c 69 67 68 74 69 6e 67 |for high|lighting|
|00005bb0| 20 74 68 65 20 73 65 6c | 65 63 74 65 64 20 64 69 | the sel|ected di|
|00005bc0| 66 66 65 72 65 6e 63 65 | 20 69 6e 20 62 75 66 66 |fference| in buff|
|00005bd0| 65 72 20 42 2e 22 20 65 | 64 69 66 66 2d 66 69 6e |er B." e|diff-fin|
|00005be0| 65 2d 64 69 66 66 2d 66 | 61 63 65 2d 41 20 22 4e |e-diff-f|ace-A "N|
|00005bf0| 61 76 79 22 20 22 73 6b | 79 20 62 6c 75 65 22 20 |avy" "sk|y blue" |
|00005c00| 74 20 6e 69 6c 20 66 72 | 61 6d 65 20 75 6e 64 65 |t nil fr|ame unde|
|00005c10| 72 6c 69 6e 65 2d 70 20 | 66 61 63 65 20 69 6e 74 |rline-p |face int|
|00005c20| 65 72 6e 61 6c 2d 73 65 | 74 2d 66 61 63 65 2d 31 |ernal-se|t-face-1|
|00005c30| 20 75 6e 64 65 72 6c 69 | 6e 65 20 37 20 22 46 61 | underli|ne 7 "Fa|
|00005c40| 63 65 20 66 6f 72 20 68 | 69 67 68 6c 69 67 68 74 |ce for h|ighlight|
|00005c50| 69 6e 67 20 74 68 65 20 | 72 65 66 69 6e 65 6d 65 |ing the |refineme|
|00005c60| 6e 74 20 6f 66 20 74 68 | 65 20 73 65 6c 65 63 74 |nt of th|e select|
|00005c70| 65 64 20 64 69 66 66 20 | 69 6e 20 62 75 66 66 65 |ed diff |in buffe|
|00005c80| 72 20 41 2e 22 20 65 64 | 69 66 66 2d 66 69 6e 65 |r A." ed|iff-fine|
|00005c90| 2d 64 69 66 66 2d 66 61 | 63 65 2d 42 20 22 42 6c |-diff-fa|ce-B "Bl|
|00005ca0| 61 63 6b 22 20 22 63 79 | 61 6e 22 20 22 46 61 63 |ack" "cy|an" "Fac|
|00005cb0| 65 20 66 6f 72 20 68 69 | 67 68 6c 69 67 68 74 69 |e for hi|ghlighti|
|00005cc0| 6e 67 20 74 68 65 20 72 | 65 66 69 6e 65 6d 65 6e |ng the r|efinemen|
|00005cd0| 74 20 6f 66 20 74 68 65 | 20 73 65 6c 65 63 74 65 |t of the| selecte|
|00005ce0| 64 20 64 69 66 66 20 69 | 6e 20 62 75 66 66 65 72 |d diff i|n buffer|
|00005cf0| 20 42 2e 22 20 65 64 69 | 66 66 2d 65 76 65 6e 2d | B." edi|ff-even-|
|00005d00| 64 69 66 66 2d 66 61 63 | 65 2d 41 20 22 62 6c 61 |diff-fac|e-A "bla|
|00005d10| 63 6b 22 20 22 6c 69 67 | 68 74 20 67 72 65 79 22 |ck" "lig|ht grey"|
|00005d20| 20 69 74 61 6c 69 63 20 | 22 46 61 63 65 20 75 73 | italic |"Face us|
|00005d30| 65 64 20 74 6f 20 68 69 | 67 68 6c 69 67 68 74 20 |ed to hi|ghlight |
|00005d40| 65 76 65 6e 2d 6e 75 6d | 62 65 72 65 64 20 64 69 |even-num|bered di|
|00005d50| 66 66 65 72 65 6e 63 65 | 73 20 69 6e 20 62 75 66 |fference|s in buf|
|00005d60| 66 65 72 20 41 2e 22 20 | 65 64 69 66 66 2d 65 76 |fer A." |ediff-ev|
|00005d70| 65 6e 2d 64 69 66 66 2d | 66 61 63 65 2d 42 20 22 |en-diff-|face-B "|
|00005d80| 57 68 69 74 65 22 20 22 | 47 72 61 79 22 20 22 46 |White" "|Gray" "F|
|00005d90| 61 63 65 20 75 73 65 64 | 20 74 6f 20 68 69 67 68 |ace used| to high|
|00005da0| 6c 69 67 68 74 20 65 76 | 65 6e 2d 6e 75 6d 62 65 |light ev|en-numbe|
|00005db0| 72 65 64 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 |red diff|erences |
|00005dc0| 69 6e 20 62 75 66 66 65 | 72 20 42 2e 22 20 65 64 |in buffe|r B." ed|
|00005dd0| 69 66 66 2d 6f 64 64 2d | 64 69 66 66 2d 66 61 63 |iff-odd-|diff-fac|
|00005de0| 65 2d 41 20 22 46 61 63 | 65 20 75 73 65 64 20 74 |e-A "Fac|e used t|
|00005df0| 6f 20 68 69 67 68 6c 69 | 67 68 74 20 6f 64 64 2d |o highli|ght odd-|
|00005e00| 6e 75 6d 62 65 72 65 64 | 20 64 69 66 66 65 72 65 |numbered| differe|
|00005e10| 6e 63 65 73 20 69 6e 20 | 62 75 66 66 65 72 20 41 |nces in |buffer A|
|00005e20| 2e 22 20 65 64 69 66 66 | 2d 6f 64 64 2d 64 69 66 |." ediff|-odd-dif|
|00005e30| 66 2d 66 61 63 65 2d 42 | 20 22 46 61 63 65 20 75 |f-face-B| "Face u|
|00005e40| 73 65 64 20 74 6f 20 68 | 69 67 68 6c 69 67 68 74 |sed to h|ighlight|
|00005e50| 20 6f 64 64 2d 6e 75 6d | 62 65 72 65 64 20 64 69 | odd-num|bered di|
|00005e60| 66 66 65 72 65 6e 63 65 | 73 20 69 6e 20 62 75 66 |fference|s in buf|
|00005e70| 66 65 72 20 42 2e 22 20 | 65 64 69 66 66 2d 65 76 |fer B." |ediff-ev|
|00005e80| 65 6e 2d 64 69 66 66 2d | 66 61 63 65 2d 41 2d 76 |en-diff-|face-A-v|
|00005e90| 61 72 20 65 64 69 66 66 | 2d 65 76 65 6e 2d 64 69 |ar ediff|-even-di|
|00005ea0| 66 66 2d 66 61 63 65 2d | 42 2d 76 61 72 20 65 64 |ff-face-|B-var ed|
|00005eb0| 69 66 66 2d 6f 64 64 2d | 64 69 66 66 2d 66 61 63 |iff-odd-|diff-fac|
|00005ec0| 65 2d 41 2d 76 61 72 20 | 65 64 69 66 66 2d 6f 64 |e-A-var |ediff-od|
|00005ed0| 64 2d 64 69 66 66 2d 66 | 61 63 65 2d 42 2d 76 61 |d-diff-f|ace-B-va|
|00005ee0| 72 20 65 64 69 66 66 2d | 69 6e 69 74 2d 76 61 72 |r ediff-|init-var|
|00005ef0| 2d 66 61 63 65 73 20 23 | 5b 6e 69 6c 20 22 c0 09 |-faces #|[nil "..|
|00005f00| 83 0d 00 5c 6e 83 0d 00 | 0b 82 0e 00 c4 c5 5c 22 |...\n...|......\"|
|00005f10| 88 c0 09 83 1f 00 5c 6e | 83 1f 00 0e 06 82 20 00 |......\n|...... .|
|00005f20| c4 c7 5c 22 88 c0 09 83 | 31 00 5c 6e 83 31 00 0e |..\"....|1.\n.1..|
|00005f30| 08 82 32 00 c4 c9 5c 22 | 88 c0 09 83 43 00 5c 6e |..2...\"|....C.\n|
|00005f40| 83 43 00 0e 5c 6e 82 44 | 00 c4 cb 5c 22 87 22 20 |.C..\n.D|...\"." |
|00005f50| 5b 63 6f 70 79 2d 66 61 | 63 65 20 65 64 69 66 66 |[copy-fa|ce ediff|
|00005f60| 2d 77 61 6e 74 2d 66 61 | 63 65 73 20 65 64 69 66 |-want-fa|ces edif|
|00005f70| 66 2d 68 69 67 68 6c 69 | 67 68 74 2d 61 6c 6c 2d |f-highli|ght-all-|
|00005f80| 64 69 66 66 73 20 65 64 | 69 66 66 2d 65 76 65 6e |diffs ed|iff-even|
|00005f90| 2d 64 69 66 66 2d 66 61 | 63 65 2d 41 20 64 65 66 |-diff-fa|ce-A def|
|00005fa0| 61 75 6c 74 20 65 64 69 | 66 66 2d 65 76 65 6e 2d |ault edi|ff-even-|
|00005fb0| 64 69 66 66 2d 66 61 63 | 65 2d 41 2d 76 61 72 20 |diff-fac|e-A-var |
|00005fc0| 65 64 69 66 66 2d 65 76 | 65 6e 2d 64 69 66 66 2d |ediff-ev|en-diff-|
|00005fd0| 66 61 63 65 2d 42 20 65 | 64 69 66 66 2d 65 76 65 |face-B e|diff-eve|
|00005fe0| 6e 2d 64 69 66 66 2d 66 | 61 63 65 2d 42 2d 76 61 |n-diff-f|ace-B-va|
|00005ff0| 72 20 65 64 69 66 66 2d | 6f 64 64 2d 64 69 66 66 |r ediff-|odd-diff|
|00006000| 2d 66 61 63 65 2d 41 20 | 65 64 69 66 66 2d 6f 64 |-face-A |ediff-od|
|00006010| 64 2d 64 69 66 66 2d 66 | 61 63 65 2d 41 2d 76 61 |d-diff-f|ace-A-va|
|00006020| 72 20 65 64 69 66 66 2d | 6f 64 64 2d 64 69 66 66 |r ediff-|odd-diff|
|00006030| 2d 66 61 63 65 2d 42 20 | 65 64 69 66 66 2d 6f 64 |-face-B |ediff-od|
|00006040| 64 2d 64 69 66 66 2d 66 | 61 63 65 2d 42 2d 76 61 |d-diff-f|ace-B-va|
|00006050| 72 5d 20 33 5d 20 65 64 | 69 66 66 2d 63 75 72 72 |r] 3] ed|iff-curr|
|00006060| 65 6e 74 2d 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |ent-diff|-overlay|
|00006070| 2d 41 20 22 4f 76 65 72 | 6c 61 79 20 73 70 65 63 |-A "Over|lay spec|
|00006080| 69 66 79 69 6e 67 20 74 | 68 65 20 63 75 72 72 65 |ifying t|he curre|
|00006090| 6e 74 20 64 69 66 66 65 | 72 65 6e 63 65 20 72 65 |nt diffe|rence re|
|000060a0| 67 69 6f 6e 20 69 6e 20 | 62 75 66 66 65 72 20 41 |gion in |buffer A|
|000060b0| 2e 22 20 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |." make-|variable|
|000060c0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 70 65 |-buffer-|local pe|
|000060d0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|000060e0| 65 73 65 72 76 65 64 20 | 65 64 69 66 66 2d 63 75 |eserved |ediff-cu|
|000060f0| 72 72 65 6e 74 2d 64 69 | 66 66 2d 6f 76 65 72 6c |rrent-di|ff-overl|
|00006100| 61 79 2d 42 20 22 4f 76 | 65 72 6c 61 79 20 73 70 |ay-B "Ov|erlay sp|
|00006110| 65 63 69 66 79 69 6e 67 | 20 74 68 65 20 63 75 72 |ecifying| the cur|
|00006120| 72 65 6e 74 20 64 69 66 | 66 65 72 65 6e 63 65 20 |rent dif|ference |
|00006130| 72 65 67 69 6f 6e 20 69 | 6e 20 62 75 66 66 65 72 |region i|n buffer|
|00006140| 20 42 2e 22 20 23 5b 28 | 74 79 70 65 29 20 22 08 | B." #[(|type) ".|
|00006150| c1 3d 83 5c 6e 00 c2 82 | 0b 00 c3 08 c1 3d 83 15 |.=.\n...|.....=..|
|00006160| 00 5c 66 82 1d 00 08 c5 | 3d 85 1d 00 0e 06 08 c1 |.\f.....|=.......|
|00006170| 3d 83 31 00 0e 07 1e 08 | c9 0e 08 21 ca 48 29 82 |=.1.....|...!.H).|
|00006180| 3c 00 0e 0b 1e 08 c9 0e | 08 21 ca 48 29 1e 08 1e |<.......|.!.H)...|
|00006190| 5c 66 89 1e 0d ce 64 64 | 0e 5c 66 23 4c 88 cf d0 |\f....dd|.\f#L...|
|000061a0| 0e 0d 21 c8 0e 08 23 88 | cf d0 0e 0d 21 d1 0e 12 |..!...#.|....!...|
|000061b0| 23 2b 87 22 20 5b 74 79 | 70 65 20 41 20 65 64 69 |#+." [ty|pe A edi|
|000061c0| 66 66 2d 63 75 72 72 65 | 6e 74 2d 64 69 66 66 2d |ff-curre|nt-diff-|
|000061d0| 6f 76 65 72 6c 61 79 2d | 41 20 65 64 69 66 66 2d |overlay-|A ediff-|
|000061e0| 63 75 72 72 65 6e 74 2d | 64 69 66 66 2d 6f 76 65 |current-|diff-ove|
|000061f0| 72 6c 61 79 2d 42 20 65 | 64 69 66 66 2d 41 2d 62 |rlay-B e|diff-A-b|
|00006200| 75 66 66 65 72 20 42 20 | 65 64 69 66 66 2d 42 2d |uffer B |ediff-B-|
|00006210| 62 75 66 66 65 72 20 65 | 64 69 66 66 2d 63 75 72 |buffer e|diff-cur|
|00006220| 72 65 6e 74 2d 64 69 66 | 66 2d 66 61 63 65 2d 41 |rent-dif|f-face-A|
|00006230| 20 66 61 63 65 20 69 6e | 74 65 72 6e 61 6c 2d 67 | face in|ternal-g|
|00006240| 65 74 2d 66 61 63 65 20 | 31 20 65 64 69 66 66 2d |et-face |1 ediff-|
|00006250| 63 75 72 72 65 6e 74 2d | 64 69 66 66 2d 66 61 63 |current-|diff-fac|
|00006260| 65 2d 42 20 62 75 66 66 | 65 72 20 6f 76 65 72 6c |e-B buff|er overl|
|00006270| 61 79 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6f 76 |ay ediff|-make-ov|
|00006280| 65 72 6c 61 79 20 65 64 | 69 66 66 2d 6f 76 65 72 |erlay ed|iff-over|
|00006290| 6c 61 79 2d 70 75 74 20 | 65 76 61 6c 20 65 64 69 |lay-put |eval edi|
|000062a0| 66 66 20 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |ff ediff|-control|
|000062b0| 2d 62 75 66 66 65 72 5d | 20 36 5d 20 65 64 69 66 |-buffer]| 6] edif|
|000062c0| 66 2d 68 69 67 68 65 73 | 74 2d 70 72 69 6f 72 69 |f-highes|t-priori|
|000062d0| 74 79 20 23 5b 28 73 74 | 61 72 74 20 65 6e 64 20 |ty #[(st|art end |
|000062e0| 62 75 66 66 65 72 29 20 | 22 c0 09 53 5d c2 1b 1c |buffer) |"..S]...|
|000062f0| c5 c6 0e 07 5c 22 83 15 | 00 0e 08 54 82 61 00 70 |....\"..|...T.a.p|
|00006300| 1e 09 0e 5c 6e 83 59 00 | cb 0e 5c 6e 21 83 59 00 |...\n.Y.|..\n!.Y.|
|00006310| cc cb 0e 5c 6e 21 21 83 | 59 00 cd 8e 0e 5c 6e 71 |...\n!!.|Y....\nq|
|00006320| 88 5c 66 64 0e 0e 54 5e | 57 83 4c 00 cf d0 5c 66 |.\fd..T^|W.L...\f|
|00006330| 21 0b 5c 22 13 d1 5c 66 | 21 89 14 82 34 00 d2 d3 |!.\"..\f|!...4...|
|00006340| d4 d5 0b 5c 22 42 21 54 | 29 82 60 00 d6 c0 21 88 |...\"B!T|).`...!.|
|00006350| d7 d8 21 29 2a 87 22 20 | 5b 31 20 73 74 61 72 74 |..!)*." |[1 start|
|00006360| 20 6e 69 6c 20 6f 76 72 | 2d 6c 69 73 74 20 70 6f | nil ovr|-list po|
|00006370| 73 20 73 74 72 69 6e 67 | 2d 6d 61 74 63 68 20 22 |s string|-match "|
|00006380| 4c 75 63 69 64 22 20 65 | 6d 61 63 73 2d 76 65 72 |Lucid" e|macs-ver|
|00006390| 73 69 6f 6e 20 65 64 69 | 66 66 2d 73 68 61 64 65 |sion edi|ff-shade|
|000063a0| 64 2d 6f 76 65 72 6c 61 | 79 2d 70 72 69 6f 72 69 |d-overla|y-priori|
|000063b0| 74 79 20 53 74 61 72 74 | 42 75 66 66 65 72 20 62 |ty Start|Buffer b|
|000063c0| 75 66 66 65 72 20 67 65 | 74 2d 62 75 66 66 65 72 |uffer ge|t-buffer|
|000063d0| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 28 28 73 | buffer-|name ((s|
|000063e0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|000063f0| 75 66 66 65 72 29 29 20 | 65 6e 64 20 61 70 70 65 |uffer)) |end appe|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
